summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 00:33:51 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 00:33:51 +0000
commit08273c7bc113d33accd622ce549a4430015e8ffe (patch)
tree508df69cc489464df3760504b1de2b23bad3abeb /content
parentdc07cbc53bbc59170c1e1a8368893d80711e82cb (diff)
downloadchromium_src-08273c7bc113d33accd622ce549a4430015e8ffe.zip
chromium_src-08273c7bc113d33accd622ce549a4430015e8ffe.tar.gz
chromium_src-08273c7bc113d33accd622ce549a4430015e8ffe.tar.bz2
Rewriting FFmpegAudioDecoder and eliminating DecoderBase.
BUG=93379 TEST=media_unittests, layout tests Review URL: http://codereview.chromium.org/6901135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/media/rtc_video_decoder.cc2
-rw-r--r--content/renderer/media/rtc_video_decoder.h4
-rw-r--r--content/renderer/media/rtc_video_decoder_unittest.cc1
3 files changed, 6 insertions, 1 deletions
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index dfc43a1..56ec6d1 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -6,8 +6,10 @@
#include <deque>
+#include "base/message_loop.h"
#include "base/task.h"
#include "media/base/callback.h"
+#include "media/base/demuxer.h"
#include "media/base/filter_host.h"
#include "media/base/filters.h"
#include "media/base/limits.h"
diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h
index 32f9c18..82b78fc 100644
--- a/content/renderer/media/rtc_video_decoder.h
+++ b/content/renderer/media/rtc_video_decoder.h
@@ -9,13 +9,15 @@
#include <string>
#include "base/gtest_prod_util.h"
+#include "base/synchronization/lock.h"
#include "base/time.h"
#include "media/base/filters.h"
#include "media/base/video_frame.h"
-#include "media/filters/decoder_base.h"
#include "third_party/libjingle/source/talk/session/phone/mediachannel.h"
#include "third_party/libjingle/source/talk/session/phone/videorenderer.h"
+class MessageLoop;
+
namespace cricket {
class VideoFrame;
} // namespace cricket
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index a247777..14a3b22 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/memory/singleton.h"
+#include "base/message_loop.h"
#include "base/string_util.h"
#include "media/base/data_buffer.h"
#include "media/base/filters.h"