diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 20:16:39 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 20:16:39 +0000 |
| commit | dc86c8b58bd613c139309c15693c1abd1118f51f (patch) | |
| tree | 5ec80f745b44f0621ad62b2a2664e031f43d42f4 /media/ffmpeg | |
| parent | 65625a34e78e75abe728ee115e9cd97815e48ba8 (diff) | |
| download | chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.zip chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.tar.gz chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.tar.bz2 | |
Revert 271945 "Roll FFmpeg for M37."
Broke gclient runhooks on Linux ChromiumOS Builder on Blink waterfall.
Bugs 119020 and 236611 will be updated with details.
> Roll FFmpeg for M37.
>
> Syncs to head as of bebce653e5601ceafa004db0eb6b2c7d4d16f0c0. The
> roll requires us to stop using some deprecated features:
> - Replaces av_get_frame_defaults() with av_frame_unref() per docs.
> - Switches FFmpegVideoDecoder to use ref-counted frames.
> - Removes error concealment settings and disables error resilience
> for all platforms except ChromeOS (since it's required for mpeg4).
>
> Avoiding these also allows us to disable some deprecated features
> wholesale via #defines.
>
> BUG=119020,236611
> TEST=all tests (and regression tests) pass under asan
> NOTRY=true
> R=jrummell@chromium.org, wolenetz@chromium.org
>
> Review URL: https://codereview.chromium.org/286953005
TBR=dalecurtis@google.com
Review URL: https://codereview.chromium.org/296483012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 10 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index ef1a7b6..c697bee 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -19,14 +19,6 @@ // Include FFmpeg header files. extern "C" { -// Disable deprecated features which result in spammy compile warnings. This -// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp -// file or the headers below will generate different structures. -#define FF_API_PIX_FMT_DESC 0 -#define FF_API_OLD_DECODE_AUDIO 0 -#define FF_API_DESTRUCT_PACKET 0 -#define FF_API_GET_BUFFER 0 - // Temporarily disable possible loss of data warning. // TODO(scherkus): fix and upstream the compiler warnings. MSVC_PUSH_DISABLE_WARNING(4244); @@ -69,7 +61,7 @@ inline void ScopedPtrAVFreeContext::operator()(void* x) const { inline void ScopedPtrAVFreeFrame::operator()(void* x) const { AVFrame* frame = static_cast<AVFrame*>(x); - av_frame_free(&frame); + avcodec_free_frame(&frame); } // Converts an int64 timestamp in |time_base| units to a base::TimeDelta. diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index dbc28c5..ea1d0e1 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -233,7 +233,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { memcpy(&packet, audio_packets_.peek(), sizeof(packet)); } - av_frame_unref(audio_buffer_.get()); + avcodec_get_frame_defaults(audio_buffer_.get()); result = avcodec_decode_audio4(av_audio_context(), audio_buffer_.get(), &got_audio, &packet); if (!audio_packets_.empty()) { @@ -287,7 +287,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { memcpy(&packet, video_packets_.peek(), sizeof(packet)); } - av_frame_unref(video_buffer_.get()); + avcodec_get_frame_defaults(video_buffer_.get()); av_video_context()->reordered_opaque = packet.pts; result = avcodec_decode_video2(av_video_context(), video_buffer_.get(), &got_picture, &packet); |