media/base/android/demuxer_stream_player_params.h - Issue 23787002: Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}.

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

Issue 23787002: Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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 | Annotate | Revision Log

OLD	NEW
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 <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "media/base/audio_decoder_config.h"	11 #include "media/base/audio_decoder_config.h"

12 #include "media/base/decrypt_config.h"	12 #include "media/base/decrypt_config.h"

13 #include "media/base/demuxer_stream.h"	13 #include "media/base/demuxer_stream.h"

14 #include "media/base/media_export.h"	14 #include "media/base/media_export.h"

15 #include "media/base/video_decoder_config.h"	15 #include "media/base/video_decoder_config.h"

16 #include "ui/gfx/size.h"	16 #include "ui/gfx/size.h"

17	17

18 namespace media {	18 namespace media {

19	19

20 struct MEDIA_EXPORT MediaPlayerHostMsg_DemuxerReady_Params {	20 struct MEDIA_EXPORT MediaConfigs {
	acolwell GONE FROM CHROMIUM 2013/08/29 22:19:53 nit: How about DemuxerConfigs or DemuxerStreamConf nit: How about DemuxerConfigs or DemuxerStreamConfigs instead?
21 MediaPlayerHostMsg_DemuxerReady_Params();	21 MediaConfigs();

22 ~MediaPlayerHostMsg_DemuxerReady_Params();	22 ~MediaConfigs();

23	23

24 AudioCodec audio_codec;	24 AudioCodec audio_codec;

25 int audio_channels;	25 int audio_channels;

26 int audio_sampling_rate;	26 int audio_sampling_rate;

27 bool is_audio_encrypted;	27 bool is_audio_encrypted;

28 std::vector<uint8> audio_extra_data;	28 std::vector<uint8> audio_extra_data;

29	29

30 VideoCodec video_codec;	30 VideoCodec video_codec;

31 gfx::Size video_size;	31 gfx::Size video_size;

32 bool is_video_encrypted;	32 bool is_video_encrypted;

(...skipping 10 matching lines...) Expand all Loading...
43 DemuxerStream::Status status;	43 DemuxerStream::Status status;

44 bool end_of_stream;	44 bool end_of_stream;

45 // TODO(ycheo): Use the shared memory to transfer the block data.	45 // TODO(ycheo): Use the shared memory to transfer the block data.

46 std::vector<uint8> data;	46 std::vector<uint8> data;

47 base::TimeDelta timestamp;	47 base::TimeDelta timestamp;

48 std::vector<char> key_id;	48 std::vector<char> key_id;

49 std::vector<char> iv;	49 std::vector<char> iv;

50 std::vector<media::SubsampleEntry> subsamples;	50 std::vector<media::SubsampleEntry> subsamples;

51 };	51 };

52	52

53 struct MEDIA_EXPORT MediaPlayerHostMsg_ReadFromDemuxerAck_Params {	53 struct MEDIA_EXPORT MediaData {
	acolwell GONE FROM CHROMIUM 2013/08/29 22:19:53 nit: How about DemuxerData or DemuxerStreamData in nit: How about DemuxerData or DemuxerStreamData instead?
54 MediaPlayerHostMsg_ReadFromDemuxerAck_Params();	54 MediaData();

55 ~MediaPlayerHostMsg_ReadFromDemuxerAck_Params();	55 ~MediaData();

56	56

57 DemuxerStream::Type type;	57 DemuxerStream::Type type;

58 std::vector<AccessUnit> access_units;	58 std::vector<AccessUnit> access_units;

59 };	59 };

60	60

61 }; // namespace media	61 }; // namespace media

62	62

63 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_	63 #endif // MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_

OLD	NEW