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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: media/mojo/services/media_type_converters.cc

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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
« media/media.gyp ('K') | « media/mojo/interfaces/media_types.mojom ('k') | media/test/data/bear-ac3-frag.mp4 » ('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 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 #include "media/mojo/services/media_type_converters.h" 5 #include "media/mojo/services/media_type_converters.h"
6 6
7 #include "media/base/audio_buffer.h" 7 #include "media/base/audio_buffer.h"
8 #include "media/base/audio_decoder_config.h" 8 #include "media/base/audio_decoder_config.h"
9 #include "media/base/buffering_state.h" 9 #include "media/base/buffering_state.h"
10 #include "media/base/cdm_config.h" 10 #include "media/base/cdm_config.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, MP3); 44 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, MP3);
45 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM); 45 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM);
46 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, Vorbis); 46 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, Vorbis);
47 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, FLAC); 47 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, FLAC);
48 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, AMR_NB); 48 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, AMR_NB);
49 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_MULAW); 49 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_MULAW);
50 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, GSM_MS); 50 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, GSM_MS);
51 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_S16BE); 51 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_S16BE);
52 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_S24BE); 52 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_S24BE);
53 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, Opus); 53 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, Opus);
54 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, EAC3);
54 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_ALAW); 55 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, PCM_ALAW);
55 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, ALAC); 56 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, ALAC);
57 ASSERT_ENUM_EQ(AudioCodec, kCodec, AUDIO_CODEC_, AC3);
56 ASSERT_ENUM_EQ_RAW(AudioCodec, kAudioCodecMax, AUDIO_CODEC_MAX); 58 ASSERT_ENUM_EQ_RAW(AudioCodec, kAudioCodecMax, AUDIO_CODEC_MAX);
57 59
58 // ChannelLayout. 60 // ChannelLayout.
59 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _NONE); 61 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _NONE);
60 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _UNSUPPORTED); 62 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _UNSUPPORTED);
61 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _MONO); 63 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _MONO);
62 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _STEREO); 64 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _STEREO);
63 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _2_1); 65 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _2_1);
64 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _SURROUND); 66 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _SURROUND);
65 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _4_0); 67 ASSERT_ENUM_EQ(ChannelLayout, CHANNEL_LAYOUT, CHANNEL_LAYOUT_k, _4_0);
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 input->natural_size.To<gfx::Size>(), 698 input->natural_size.To<gfx::Size>(),
697 base::TimeDelta::FromMicroseconds(input->timestamp_usec)); 699 base::TimeDelta::FromMicroseconds(input->timestamp_usec));
698 CopyPlaneData(input->y_data.storage(), media::VideoFrame::kYPlane, frame); 700 CopyPlaneData(input->y_data.storage(), media::VideoFrame::kYPlane, frame);
699 CopyPlaneData(input->u_data.storage(), media::VideoFrame::kUPlane, frame); 701 CopyPlaneData(input->u_data.storage(), media::VideoFrame::kUPlane, frame);
700 CopyPlaneData(input->v_data.storage(), media::VideoFrame::kVPlane, frame); 702 CopyPlaneData(input->v_data.storage(), media::VideoFrame::kVPlane, frame);
701 703
702 return frame; 704 return frame;
703 } 705 }
704 706
705 } // namespace mojo 707 } // namespace mojo
OLDNEW
« media/media.gyp ('K') | « media/mojo/interfaces/media_types.mojom ('k') | media/test/data/bear-ac3-frag.mp4 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698