Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: content/common/gpu/media/android_video_decode_accelerator.h

Issue 14932020: Add Create() function to AudioCodecBridge and VideoCodecBridge to allow return of null pointers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove dependency, remove target in another CL Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all_android.gyp ('k') | content/common/gpu/media/android_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/android_video_decode_accelerator.h
diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h
index e8929992973808471f027e23bf051955832c0701..b84683105a9f36d53929d8fa793cc44177411481 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.h
+++ b/content/common/gpu/media/android_video_decode_accelerator.h
@@ -25,7 +25,6 @@ class SurfaceTextureBridge;
}
namespace content {
-
// A VideoDecodeAccelerator implementation for Android.
// This class decodes the input encoded stream by using Android's MediaCodec
// class. http://developer.android.com/reference/android/media/MediaCodec.html
@@ -59,7 +58,7 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator :
virtual ~AndroidVideoDecodeAccelerator();
// Configures |media_codec_| with the given codec parameters from the client.
- void ConfigureMediaCodec();
+ bool ConfigureMediaCodec();
// Sends the current picture on the surface to the client.
void SendCurrentSurfaceToClient(int32 bitstream_id);
@@ -163,6 +162,8 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator :
// Used for copy the texture from |surface_texture_| to picture buffers.
scoped_ptr<gpu::CopyTextureCHROMIUMResourceManager> copier_;
+
+ friend class AndroidVideoDecodeAcceleratorTest;
};
} // namespace content
« no previous file with comments | « build/all_android.gyp ('k') | content/common/gpu/media/android_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698