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

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

Issue 889053003: Revert of media: Enable Opus support in Clank <video> and MSE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_DEMUXER_STREAM_PLAYER_PARAMS_H_ 5 #ifndef MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ 6 #define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
11 #include "media/base/decrypt_config.h" 11 #include "media/base/decrypt_config.h"
12 #include "media/base/demuxer_stream.h" 12 #include "media/base/demuxer_stream.h"
13 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
14 #include "media/base/video_decoder_config.h" 14 #include "media/base/video_decoder_config.h"
15 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 struct MEDIA_EXPORT DemuxerConfigs { 19 struct MEDIA_EXPORT DemuxerConfigs {
20 DemuxerConfigs(); 20 DemuxerConfigs();
21 ~DemuxerConfigs(); 21 ~DemuxerConfigs();
22 22
23 AudioCodec audio_codec; 23 AudioCodec audio_codec;
24 int audio_channels; 24 int audio_channels;
25 int audio_sampling_rate; 25 int audio_sampling_rate;
26 bool is_audio_encrypted; 26 bool is_audio_encrypted;
27 std::vector<uint8> audio_extra_data; 27 std::vector<uint8> audio_extra_data;
28 int64 audio_codec_delay_ns;
29 int64 audio_seek_preroll_ns;
30 28
31 VideoCodec video_codec; 29 VideoCodec video_codec;
32 gfx::Size video_size; 30 gfx::Size video_size;
33 bool is_video_encrypted; 31 bool is_video_encrypted;
34 std::vector<uint8> video_extra_data; 32 std::vector<uint8> video_extra_data;
35 33
36 base::TimeDelta duration; 34 base::TimeDelta duration;
37 }; 35 };
38 36
39 struct MEDIA_EXPORT AccessUnit { 37 struct MEDIA_EXPORT AccessUnit {
(...skipping 20 matching lines...) Expand all
60 // a corresponding DemuxerConfigs is added into this vector. The 58 // a corresponding DemuxerConfigs is added into this vector. The
61 // DemuxerConfigs should only contain information of the stream that is 59 // DemuxerConfigs should only contain information of the stream that is
62 // specified by |type|. This solves the issue that we need multiple IPCs when 60 // specified by |type|. This solves the issue that we need multiple IPCs when
63 // demuxer configs change. 61 // demuxer configs change.
64 std::vector<DemuxerConfigs> demuxer_configs; 62 std::vector<DemuxerConfigs> demuxer_configs;
65 }; 63 };
66 64
67 }; // namespace media 65 }; // namespace media
68 66
69 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ 67 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_
OLDNEW
« no previous file with comments | « media/base/android/audio_decoder_job.cc ('k') | media/base/android/demuxer_stream_player_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698