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

Side by Side Diff: media/base/android/ndk_media_codec_bridge.h

Issue 2047003003: Rename MediaCodecBridge::Reset() to Flush() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple Created 4 years, 6 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
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <media/NdkMediaCodec.h> 8 #include <media/NdkMediaCodec.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 11
12 #include <memory> 12 #include <memory>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "media/base/android/media_codec_bridge.h" 16 #include "media/base/android/media_codec_bridge.h"
17 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
18 #include "ui/gfx/geometry/size.h" 18 #include "ui/gfx/geometry/size.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge { 22 class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
23 public: 23 public:
24 ~NdkMediaCodecBridge() override; 24 ~NdkMediaCodecBridge() override;
25 25
26 // MediaCodecBridge implementation. 26 // MediaCodecBridge implementation.
27 MediaCodecStatus Reset() override;
28 bool Start() override; 27 bool Start() override;
29 void Stop() override; 28 void Stop() override;
29 MediaCodecStatus Flush() override;
30 MediaCodecStatus GetOutputSize(gfx::Size* size) override; 30 MediaCodecStatus GetOutputSize(gfx::Size* size) override;
31 MediaCodecStatus GetOutputSamplingRate(int* sampling_rate) override; 31 MediaCodecStatus GetOutputSamplingRate(int* sampling_rate) override;
32 MediaCodecStatus GetOutputChannelCount(int* channel_count) override; 32 MediaCodecStatus GetOutputChannelCount(int* channel_count) override;
33 MediaCodecStatus QueueInputBuffer( 33 MediaCodecStatus QueueInputBuffer(
34 int index, 34 int index,
35 const uint8_t* data, 35 const uint8_t* data,
36 size_t data_size, 36 size_t data_size,
37 const base::TimeDelta& presentation_time) override; 37 const base::TimeDelta& presentation_time) override;
38 using MediaCodecBridge::QueueSecureInputBuffer; 38 using MediaCodecBridge::QueueSecureInputBuffer;
39 MediaCodecStatus QueueSecureInputBuffer( 39 MediaCodecStatus QueueSecureInputBuffer(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 }; 75 };
76 76
77 std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_; 77 std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge); 79 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
80 }; 80 };
81 81
82 } // namespace media 82 } // namespace media
83 83
84 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 84 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698