diff --git a/examples/filters/SimpleFilter.cpp b/examples/filters/SimpleFilter.cpp index 57d4d7950..ef96c4ddd 100644 --- a/examples/filters/SimpleFilter.cpp +++ b/examples/filters/SimpleFilter.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/examples/filters/SimpleFilter.h b/examples/filters/SimpleFilter.h index f5a00d3d2..0db3031dd 100644 --- a/examples/filters/SimpleFilter.h +++ b/examples/filters/SimpleFilter.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/examples/player/filters/OSD.cpp b/examples/player/filters/OSD.cpp index f13f60cde..91d8a2856 100644 --- a/examples/player/filters/OSD.cpp +++ b/examples/player/filters/OSD.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/examples/player/filters/OSD.h b/examples/player/filters/OSD.h index e1d73cc70..617f0ba85 100644 --- a/examples/player/filters/OSD.h +++ b/examples/player/filters/OSD.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/examples/player/filters/OSDFilter.cpp b/examples/player/filters/OSDFilter.cpp index d32ed5139..7830559f3 100644 --- a/examples/player/filters/OSDFilter.cpp +++ b/examples/player/filters/OSDFilter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/examples/player/filters/OSDFilter.h b/examples/player/filters/OSDFilter.h index a0a9438ca..32849aca1 100644 --- a/examples/player/filters/OSDFilter.h +++ b/examples/player/filters/OSDFilter.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/MediaMetaData.cpp b/qml/MediaMetaData.cpp index 72314888f..4e87b6fae 100644 --- a/qml/MediaMetaData.cpp +++ b/qml/MediaMetaData.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QmlAV/MediaMetaData.h b/qml/QmlAV/MediaMetaData.h index 44571f293..a7b2ebfe2 100644 --- a/qml/QmlAV/MediaMetaData.h +++ b/qml/QmlAV/MediaMetaData.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QmlAV/QuickSubtitleItem.h b/qml/QmlAV/QuickSubtitleItem.h index 9e01c7b0c..250117c96 100644 --- a/qml/QmlAV/QuickSubtitleItem.h +++ b/qml/QmlAV/QuickSubtitleItem.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QmlAV/QuickVideoPreview.h b/qml/QmlAV/QuickVideoPreview.h index 2f182b19e..484b0134d 100644 --- a/qml/QmlAV/QuickVideoPreview.h +++ b/qml/QmlAV/QuickVideoPreview.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QmlAV/SGVideoNode.h b/qml/QmlAV/SGVideoNode.h index 616f04d28..88e246c31 100644 --- a/qml/QmlAV/SGVideoNode.h +++ b/qml/QmlAV/SGVideoNode.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QuickSubtitleItem.cpp b/qml/QuickSubtitleItem.cpp index 9b5775f8b..cc25da61d 100644 --- a/qml/QuickSubtitleItem.cpp +++ b/qml/QuickSubtitleItem.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/QuickVideoPreview.cpp b/qml/QuickVideoPreview.cpp index 787409337..ad3357956 100644 --- a/qml/QuickVideoPreview.cpp +++ b/qml/QuickVideoPreview.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp index 2e7612c79..105841769 100644 --- a/qml/SGVideoNode.cpp +++ b/qml/SGVideoNode.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/ImageConverterIPP.cpp b/src/ImageConverterIPP.cpp index 22c03e0a9..741c4af19 100644 --- a/src/ImageConverterIPP.cpp +++ b/src/ImageConverterIPP.cpp @@ -1,6 +1,6 @@ /****************************************************************************** ImageConverterIPP: Image resizing & color model convertion using Intel IPP - Copyright (C) 2012-2015 Wang Bin + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/AVClock.h b/src/QtAV/AVClock.h index 487a59d47..980e3b118 100644 --- a/src/QtAV/AVClock.h +++ b/src/QtAV/AVClock.h @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/AVDecoder.h b/src/QtAV/AVDecoder.h index 1d4787606..ef2c1db2e 100644 --- a/src/QtAV/AVDecoder.h +++ b/src/QtAV/AVDecoder.h @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/AVEncoder.h b/src/QtAV/AVEncoder.h index 3ac2fe719..8cb7f3276 100644 --- a/src/QtAV/AVEncoder.h +++ b/src/QtAV/AVEncoder.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/AVOutput.h b/src/QtAV/AVOutput.h index 38217976a..c465eea8f 100644 --- a/src/QtAV/AVOutput.h +++ b/src/QtAV/AVOutput.h @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/AudioDecoder.h b/src/QtAV/AudioDecoder.h index f7ab70f77..1c8ffd755 100644 --- a/src/QtAV/AudioDecoder.h +++ b/src/QtAV/AudioDecoder.h @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/AudioEncoder.h b/src/QtAV/AudioEncoder.h index d849bf8d5..6ba6328b4 100644 --- a/src/QtAV/AudioEncoder.h +++ b/src/QtAV/AudioEncoder.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/Packet.h b/src/QtAV/Packet.h index 7ba6b2b47..0ef314c1c 100644 --- a/src/QtAV/Packet.h +++ b/src/QtAV/Packet.h @@ -69,7 +69,6 @@ class Q_AV_EXPORT Packet qint64 position; // position in source file byte stream private: - // TODO: implicity shared. can not use QSharedData // we must define default/copy ctor, dtor and operator= so that we can provide only forward declaration of PacketPrivate mutable QSharedDataPointer d; }; diff --git a/src/QtAV/QPainterRenderer.h b/src/QtAV/QPainterRenderer.h index b286eede3..424b1f747 100644 --- a/src/QtAV/QPainterRenderer.h +++ b/src/QtAV/QPainterRenderer.h @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/Statistics.h b/src/QtAV/Statistics.h index c03f7c968..388099162 100644 --- a/src/QtAV/Statistics.h +++ b/src/QtAV/Statistics.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/VideoEncoder.h b/src/QtAV/VideoEncoder.h index c6f15a819..640421d8a 100644 --- a/src/QtAV/VideoEncoder.h +++ b/src/QtAV/VideoEncoder.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/private/AVEncoder_p.h b/src/QtAV/private/AVEncoder_p.h index 70585d2e7..09320ce3a 100644 --- a/src/QtAV/private/AVEncoder_p.h +++ b/src/QtAV/private/AVEncoder_p.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/private/Filter_p.h b/src/QtAV/private/Filter_p.h index 8d6b248e7..db313a094 100644 --- a/src/QtAV/private/Filter_p.h +++ b/src/QtAV/private/Filter_p.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/private/Frame_p.h b/src/QtAV/private/Frame_p.h index aab0576a6..dab70ccff 100644 --- a/src/QtAV/private/Frame_p.h +++ b/src/QtAV/private/Frame_p.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/private/MediaIO_p.h b/src/QtAV/private/MediaIO_p.h index e4750f687..bf7514667 100644 --- a/src/QtAV/private/MediaIO_p.h +++ b/src/QtAV/private/MediaIO_p.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/QtAV/private/QPainterRenderer_p.h b/src/QtAV/private/QPainterRenderer_p.h index cbb4fcb22..8cb387466 100644 --- a/src/QtAV/private/QPainterRenderer_p.h +++ b/src/QtAV/private/QPainterRenderer_p.h @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/QtAV/private/factory.h b/src/QtAV/private/factory.h index cfa9ee831..48d04fdac 100644 --- a/src/QtAV/private/factory.h +++ b/src/QtAV/private/factory.h @@ -1,6 +1,6 @@ /****************************************************************************** Factory: factory template - Copyright (C) 2012-2015 Wang Bin + Copyright (C) 2012-2016 Wang Bin This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -66,13 +66,12 @@ Class& Loki::Singleton::Instance() T* T::create(const char* name) { return T::create(T::id(name));} \ T##Id* T::next(T##Id *id) { \ const std::vector& ids = T##Factory::Instance().registeredIds(); \ - if (!id) return (T##Id*)&ids[0]; DBG(#T "::next(%p)\n", id);\ + if (!id) return (T##Id*)&ids[0]; \ T##Id *id0 = (T##Id*)&ids[0], *id1 = (T##Id*)&ids[ids.size() - 1]; \ if (id >= id0 && id < id1) return id + 1; \ if (id == id1) return NULL; \ std::vector::const_iterator it = std::find(ids.begin(), ids.end(), *id); \ if (it == ids.end()) return NULL; \ - DBG(#T "::next(%p) found\n", id); \ return (T##Id*)&*(it++); \ } \ T##Id T::id(const char* name) { DBG(#T "::id(\"%s\")\n", name); return T##Factory::Instance().id(name, false);} \ diff --git a/src/Statistics.cpp b/src/Statistics.cpp index f4c39ec8e..3ce107d9b 100644 --- a/src/Statistics.cpp +++ b/src/Statistics.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/VideoFrameExtractor.cpp b/src/VideoFrameExtractor.cpp index 46052f5a9..593f4cd9b 100644 --- a/src/VideoFrameExtractor.cpp +++ b/src/VideoFrameExtractor.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2016 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -59,7 +59,7 @@ class ExtractThread : public QThread { void addTask(QRunnable* t) { if (tasks.size() >= tasks.capacity()) { - QRunnable *task = tasks.take(); + QRunnable *task = tasks.take(); //clear only for seek task if (task->autoDelete()) delete task; } diff --git a/src/codec/AVDecoder.cpp b/src/codec/AVDecoder.cpp index 0527c260d..80e5caa57 100644 --- a/src/codec/AVDecoder.cpp +++ b/src/codec/AVDecoder.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/codec/AVEncoder.cpp b/src/codec/AVEncoder.cpp index 9462cbf1f..455539c78 100644 --- a/src/codec/AVEncoder.cpp +++ b/src/codec/AVEncoder.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -48,7 +48,7 @@ void AVEncoder::setCodecName(const QString &name) if (d.codec_name == name) return; d.codec_name = name; - emit codecNameChanged(); + Q_EMIT codecNameChanged(); } QString AVEncoder::codecName() const diff --git a/src/codec/video/VideoDecoderCedarv.cpp b/src/codec/video/VideoDecoderCedarv.cpp index e99ea80ca..9392fb4f2 100644 --- a/src/codec/video/VideoDecoderCedarv.cpp +++ b/src/codec/video/VideoDecoderCedarv.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin Miroslav Bendik diff --git a/src/codec/video/VideoDecoderFFmpeg.cpp b/src/codec/video/VideoDecoderFFmpeg.cpp index 3971c7af5..3da570ce6 100644 --- a/src/codec/video/VideoDecoderFFmpeg.cpp +++ b/src/codec/video/VideoDecoderFFmpeg.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV (from 2013) diff --git a/src/codec/video/VideoDecoderFFmpegBase.cpp b/src/codec/video/VideoDecoderFFmpegBase.cpp index d40dd83d4..9a367b266 100644 --- a/src/codec/video/VideoDecoderFFmpegBase.cpp +++ b/src/codec/video/VideoDecoderFFmpegBase.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV (from 2014) diff --git a/src/codec/video/VideoDecoderFFmpegBase.h b/src/codec/video/VideoDecoderFFmpegBase.h index b4f00aca8..57948751b 100644 --- a/src/codec/video/VideoDecoderFFmpegBase.h +++ b/src/codec/video/VideoDecoderFFmpegBase.h @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV (from 2014) diff --git a/src/codec/video/VideoEncoderFFmpeg.cpp b/src/codec/video/VideoEncoderFFmpeg.cpp index c4c662bc9..e119b94c3 100644 --- a/src/codec/video/VideoEncoderFFmpeg.cpp +++ b/src/codec/video/VideoEncoderFFmpeg.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -121,12 +121,10 @@ bool VideoEncoderFFmpegPrivate::open() av_dict_set(&dict, "tune", "zerolatency", 0); av_dict_set(&dict, "profile", "main", 0); } -#ifdef FF_PROFILE_HEVC_MAIN if(avctx->codec_id == AV_CODEC_ID_HEVC){ av_dict_set(&dict, "preset", "ultrafast", 0); av_dict_set(&dict, "tune", "zero-latency", 0); } -#endif //FF_PROFILE_HEVC_MAIN #endif applyOptionsForContext(); AV_ENSURE_OK(avcodec_open2(avctx, codec, &dict), false); diff --git a/src/io/AndroidIO.cpp b/src/io/AndroidIO.cpp index 7ab11d21f..e4913165f 100644 --- a/src/io/AndroidIO.cpp +++ b/src/io/AndroidIO.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/io/QIODeviceIO.cpp b/src/io/QIODeviceIO.cpp index bc369f894..f8b671638 100644 --- a/src/io/QIODeviceIO.cpp +++ b/src/io/QIODeviceIO.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV (from 2014) diff --git a/src/io/WinRTIO.cpp b/src/io/WinRTIO.cpp index 2628f8165..c0910e66e 100644 --- a/src/io/WinRTIO.cpp +++ b/src/io/WinRTIO.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/output/AVOutput.cpp b/src/output/AVOutput.cpp index 1ceb9636d..59df79fed 100644 --- a/src/output/AVOutput.cpp +++ b/src/output/AVOutput.cpp @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/output/audio/AudioOutputAudioToolbox.cpp b/src/output/audio/AudioOutputAudioToolbox.cpp index 228208ad3..32fbfe733 100644 --- a/src/output/audio/AudioOutputAudioToolbox.cpp +++ b/src/output/audio/AudioOutputAudioToolbox.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV (from 2016-02-11) diff --git a/src/output/audio/AudioOutputNull.cpp b/src/output/audio/AudioOutputNull.cpp index 3fcf6bba7..b29822f2a 100644 --- a/src/output/audio/AudioOutputNull.cpp +++ b/src/output/audio/AudioOutputNull.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,7 @@ #include "QtAV/private/factory.h" namespace QtAV { - +//TODO: block internally static const char kName[] = "null"; class AudioOutputNull : public AudioOutputBackend { diff --git a/src/output/audio/AudioOutputPortAudio.cpp b/src/output/audio/AudioOutputPortAudio.cpp index ef85fd45c..13ce37a9e 100644 --- a/src/output/audio/AudioOutputPortAudio.cpp +++ b/src/output/audio/AudioOutputPortAudio.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/output/audio/AudioOutputPulse.cpp b/src/output/audio/AudioOutputPulse.cpp index 118f5bbfc..a468e3586 100644 --- a/src/output/audio/AudioOutputPulse.cpp +++ b/src/output/audio/AudioOutputPulse.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -322,7 +322,7 @@ bool AudioOutputPulse::init(const AudioFormat &format) ba.tlength = PA_STREAM_ADJUST_LATENCY;//(uint32_t)-1; // ? ba.prebuf = 1;//(uint32_t)-1; // play as soon as possible ba.minreq = (uint32_t)-1; - //ba.fragsize = (uint32_t)-1; + //ba.fragsize = (uint32_t)-1; //latency // PA_STREAM_NOT_MONOTONIC? pa_stream_flags_t flags = pa_stream_flags_t(PA_STREAM_NOT_MONOTONIC|PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE); if (pa_stream_connect_playback(stream, NULL /*sink*/, &ba, flags, NULL, NULL) < 0) { diff --git a/src/output/video/QPainterRenderer.cpp b/src/output/video/QPainterRenderer.cpp index bfcae34a3..44a6b62e6 100644 --- a/src/output/video/QPainterRenderer.cpp +++ b/src/output/video/QPainterRenderer.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg + QtAV: Multimedia framework based on Qt and FFmpeg Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/subtitle/CharsetDetector.cpp b/src/subtitle/CharsetDetector.cpp index 2881f9026..b45c66f5b 100644 --- a/src/subtitle/CharsetDetector.cpp +++ b/src/subtitle/CharsetDetector.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/subtitle/CharsetDetector.h b/src/subtitle/CharsetDetector.h index ea3a0ce62..baf9ba8b8 100644 --- a/src/subtitle/CharsetDetector.h +++ b/src/subtitle/CharsetDetector.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/subtitle/PlainText.cpp b/src/subtitle/PlainText.cpp index 125c5d2e5..7d84c066f 100644 --- a/src/subtitle/PlainText.cpp +++ b/src/subtitle/PlainText.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/subtitle/PlainText.h b/src/subtitle/PlainText.h index fffdea9f1..3b1e6ddfb 100644 --- a/src/subtitle/PlainText.h +++ b/src/subtitle/PlainText.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/CopyFrame_SSE2.cpp b/src/utils/CopyFrame_SSE2.cpp index 95ef05a18..78be9b0b2 100644 --- a/src/utils/CopyFrame_SSE2.cpp +++ b/src/utils/CopyFrame_SSE2.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/CopyFrame_SSE4.cpp b/src/utils/CopyFrame_SSE4.cpp index d27f15bc5..8a6725ed8 100644 --- a/src/utils/CopyFrame_SSE4.cpp +++ b/src/utils/CopyFrame_SSE4.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/GPUMemCopy.cpp b/src/utils/GPUMemCopy.cpp index 2c880b9f4..e434b8e0a 100644 --- a/src/utils/GPUMemCopy.cpp +++ b/src/utils/GPUMemCopy.cpp @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/utils/GPUMemCopy.h b/src/utils/GPUMemCopy.h index 2587fc079..6c6f12d9c 100644 --- a/src/utils/GPUMemCopy.h +++ b/src/utils/GPUMemCopy.h @@ -1,6 +1,6 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2012-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin * This file is part of QtAV diff --git a/src/utils/Logger.cpp b/src/utils/Logger.cpp index 7d9556fba..30cda170b 100644 --- a/src/utils/Logger.cpp +++ b/src/utils/Logger.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/Logger.h b/src/utils/Logger.h index 624c8b394..a8749071d 100644 --- a/src/utils/Logger.h +++ b/src/utils/Logger.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2013-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2013) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/SharedPtr.h b/src/utils/SharedPtr.h index 777044ad3..aa8e037bf 100644 --- a/src/utils/SharedPtr.h +++ b/src/utils/SharedPtr.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/utils/ring.h b/src/utils/ring.h index f42c1854d..82396dbb3 100644 --- a/src/utils/ring.h +++ b/src/utils/ring.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2015) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/vaapi/vaapi_helper.cpp b/src/vaapi/vaapi_helper.cpp index 76e5cc842..ccf7986a7 100644 --- a/src/vaapi/vaapi_helper.cpp +++ b/src/vaapi/vaapi_helper.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/vaapi/vaapi_helper.h b/src/vaapi/vaapi_helper.h index ffc86f6eb..8d3751859 100644 --- a/src/vaapi/vaapi_helper.h +++ b/src/vaapi/vaapi_helper.h @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/tests/ao/main.cpp b/tests/ao/main.cpp index 25f307e75..c91e60ee2 100644 --- a/tests/ao/main.cpp +++ b/tests/ao/main.cpp @@ -1,8 +1,8 @@ /****************************************************************************** - QtAV: Media play library based on Qt and FFmpeg - Copyright (C) 2014-2015 Wang Bin + QtAV: Multimedia framework based on Qt and FFmpeg + Copyright (C) 2012-2016 Wang Bin -* This file is part of QtAV +* This file is part of QtAV (from 2014) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public