projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move raw_convert into libdcp.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg.cc
diff --git
a/src/lib/ffmpeg.cc
b/src/lib/ffmpeg.cc
index bfa3d4e7f7dd8401976d5f08e9af8f03af8f72b2..1f16514d7496b780b31d1ff5a4002d54c0f63923 100644
(file)
--- a/
src/lib/ffmpeg.cc
+++ b/
src/lib/ffmpeg.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,12
+23,12
@@
#include "film.h"
#include "exceptions.h"
#include "util.h"
#include "film.h"
#include "exceptions.h"
#include "util.h"
-#include "raw_convert.h"
#include "log.h"
#include "ffmpeg_subtitle_stream.h"
#include "ffmpeg_audio_stream.h"
#include "log.h"
#include "ffmpeg_subtitle_stream.h"
#include "ffmpeg_audio_stream.h"
-#include "
md5_
digester.h"
+#include "digester.h"
#include "compose.hpp"
#include "compose.hpp"
+#include <dcp/raw_convert.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-45,6
+46,7
@@
using std::cerr;
using std::vector;
using boost::shared_ptr;
using boost::optional;
using std::vector;
using boost::shared_ptr;
using boost::optional;
+using dcp::raw_convert;
boost::mutex FFmpeg::_mutex;
boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;
boost::mutex FFmpeg::_mutex;
boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;
@@
-200,12
+202,16
@@
FFmpeg::setup_decoders ()
AVCodec* codec = avcodec_find_decoder (context->codec_id);
if (codec) {
AVCodec* codec = avcodec_find_decoder (context->codec_id);
if (codec) {
+ AVDictionary* options = 0;
/* This option disables decoding of DCA frame footers in our patched version
of FFmpeg. I believe these footers are of no use to us, and they can cause
problems when FFmpeg fails to decode them (mantis #352).
*/
/* This option disables decoding of DCA frame footers in our patched version
of FFmpeg. I believe these footers are of no use to us, and they can cause
problems when FFmpeg fails to decode them (mantis #352).
*/
- AVDictionary* options = 0;
av_dict_set (&options, "disable_footer", "1", 0);
av_dict_set (&options, "disable_footer", "1", 0);
+ /* This allows decoding of some DNxHR 444 and HQX files; see
+ https://trac.ffmpeg.org/ticket/5681
+ */
+ av_dict_set_int (&options, "strict", FF_COMPLIANCE_EXPERIMENTAL, 0);
if (avcodec_open2 (context, codec, &options) < 0) {
throw DecodeError (N_("could not open decoder"));
if (avcodec_open2 (context, codec, &options) < 0) {
throw DecodeError (N_("could not open decoder"));
@@
-219,7
+225,10
@@
FFmpeg::setup_decoders ()
AVCodecContext *
FFmpeg::video_codec_context () const
{
AVCodecContext *
FFmpeg::video_codec_context () const
{
- DCPOMATIC_ASSERT (_video_stream);
+ if (!_video_stream) {
+ return 0;
+ }
+
return _format_context->streams[_video_stream.get()]->codec;
}
return _format_context->streams[_video_stream.get()]->codec;
}
@@
-268,7
+277,7
@@
FFmpeg::subtitle_period (AVSubtitle const & sub)
string
FFmpeg::subtitle_id (AVSubtitle const & sub)
{
string
FFmpeg::subtitle_id (AVSubtitle const & sub)
{
-
MD5
Digester digester;
+ Digester digester;
digester.add (sub.pts);
for (unsigned int i = 0; i < sub.num_rects; ++i) {
AVSubtitleRect* rect = sub.rects[i];
digester.add (sub.pts);
for (unsigned int i = 0; i < sub.num_rects; ++i) {
AVSubtitleRect* rect = sub.rects[i];