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

Side by Side Diff: content/common/gpu/media/vt_video_decode_accelerator.h

Issue 374153003: Use PPS/SPS NALUs to initialize a VTDecompressionSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix posting to decoder thread. Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_ 5 #ifndef CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
6 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_ 6 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
7 7
8 #include <stdint.h> 8 #include "base/basictypes.h"
9 9 #include "base/mac/scoped_cftyperef.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/message_loop/message_loop_proxy.h" 13 #include "base/threading/thread.h"
14 #include "content/common/gpu/media/vt.h"
15 #include "media/filters/h264_parser.h"
14 #include "media/video/video_decode_accelerator.h" 16 #include "media/video/video_decode_accelerator.h"
15 #include "ui/gl/gl_context_cgl.h" 17 #include "ui/gl/gl_context_cgl.h"
16 18
19 namespace base {
20 class SingleThreadTaskRunner;
21 } // namespace base
22
17 namespace content { 23 namespace content {
18 24
19 // (Stub of a) VideoToolbox.framework implementation of the 25 // VideoToolbox.framework implementation of the VideoDecodeAccelerator
20 // VideoDecodeAccelerator interface for Mac OS X. 26 // interface for Mac OS X (currently limited to 10.9+).
21 class VTVideoDecodeAccelerator 27 class VTVideoDecodeAccelerator
22 : public media::VideoDecodeAccelerator, 28 : public media::VideoDecodeAccelerator,
23 public base::NonThreadSafe { 29 public base::NonThreadSafe {
24 public: 30 public:
25 explicit VTVideoDecodeAccelerator(CGLContextObj cgl_context); 31 explicit VTVideoDecodeAccelerator(CGLContextObj cgl_context);
26 virtual ~VTVideoDecodeAccelerator(); 32 virtual ~VTVideoDecodeAccelerator();
27 33
28 // VideoDecodeAccelerator implementation. 34 // VideoDecodeAccelerator implementation.
29 virtual bool Initialize( 35 virtual bool Initialize(
30 media::VideoCodecProfile profile, 36 media::VideoCodecProfile profile,
31 Client* client) OVERRIDE; 37 Client* client) OVERRIDE;
32 virtual void Decode(const media::BitstreamBuffer& bitstream) OVERRIDE; 38 virtual void Decode(const media::BitstreamBuffer& bitstream) OVERRIDE;
33 virtual void AssignPictureBuffers( 39 virtual void AssignPictureBuffers(
34 const std::vector<media::PictureBuffer>& pictures) OVERRIDE; 40 const std::vector<media::PictureBuffer>& pictures) OVERRIDE;
35 virtual void ReusePictureBuffer(int32_t picture_id) OVERRIDE; 41 virtual void ReusePictureBuffer(int32_t picture_id) OVERRIDE;
36 virtual void Flush() OVERRIDE; 42 virtual void Flush() OVERRIDE;
37 virtual void Reset() OVERRIDE; 43 virtual void Reset() OVERRIDE;
38 virtual void Destroy() OVERRIDE; 44 virtual void Destroy() OVERRIDE;
39 virtual bool CanDecodeOnIOThread() OVERRIDE; 45 virtual bool CanDecodeOnIOThread() OVERRIDE;
40 46
47 // Called by VideoToolbox when a frame is decoded.
48 void Output(
49 int32_t bitstream_id,
50 OSStatus status,
51 VTDecodeInfoFlags info_flags,
52 CVImageBufferRef image_buffer);
53
41 private: 54 private:
42 scoped_refptr<base::MessageLoopProxy> loop_proxy_; 55 // Configure a VideoToolbox decompression session from parameter set NALUs.
56 void ConfigureDecoder(
57 const std::vector<const uint8_t*>& nalu_data_ptrs,
58 const std::vector<size_t>& nalu_data_sizes);
59
60 // Decode a frame of bitstream.
61 void DecodeTask(const media::BitstreamBuffer);
62
63 scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner_;
scherkus (not reviewing) 2014/07/09 22:39:25 nit: I'd just get rid of this until you need it
43 CGLContextObj cgl_context_; 64 CGLContextObj cgl_context_;
44 media::VideoDecodeAccelerator::Client* client_; 65 media::VideoDecodeAccelerator::Client* client_;
66 base::Thread decoder_thread_;
67
68 // Decoder configuration (used only on decoder thread).
69 VTDecompressionOutputCallbackRecord callback_;
70 base::ScopedCFTypeRef<CMFormatDescriptionRef> format_;
71 base::ScopedCFTypeRef<VTDecompressionSessionRef> session_;
72 media::H264Parser parser_;
73 int32_t coded_width_;
Pawel Osciak 2014/07/10 00:10:55 Nit: use gfx::Size ?
74 int32_t coded_height_;
45 75
46 // Member variables should appear before the WeakPtrFactory, to ensure 76 // Member variables should appear before the WeakPtrFactory, to ensure
47 // that any WeakPtrs to Controller are invalidated before its members 77 // that any WeakPtrs to Controller are invalidated before its members
48 // variable's destructors are executed, rendering them invalid. 78 // variable's destructors are executed, rendering them invalid.
49 base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_; 79 base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_;
50 80
51 DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator); 81 DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
52 }; 82 };
53 83
54 } // namespace content 84 } // namespace content
55 85
56 #endif // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_ 86 #endif // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698