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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef 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
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 <stddef.h>
8 #include <stdint.h>
9
7 #include "media/base/audio_buffer.h" 10 #include "media/base/audio_buffer.h"
8 #include "media/base/audio_decoder_config.h" 11 #include "media/base/audio_decoder_config.h"
9 #include "media/base/buffering_state.h" 12 #include "media/base/buffering_state.h"
10 #include "media/base/cdm_config.h" 13 #include "media/base/cdm_config.h"
11 #include "media/base/cdm_key_information.h" 14 #include "media/base/cdm_key_information.h"
12 #include "media/base/decoder_buffer.h" 15 #include "media/base/decoder_buffer.h"
13 #include "media/base/decrypt_config.h" 16 #include "media/base/decrypt_config.h"
14 #include "media/base/decryptor.h" 17 #include "media/base/decryptor.h"
15 #include "media/base/demuxer_stream.h" 18 #include "media/base/demuxer_stream.h"
16 #include "media/base/media_keys.h" 19 #include "media/base/media_keys.h"
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 input->natural_size.To<gfx::Size>(), 699 input->natural_size.To<gfx::Size>(),
697 base::TimeDelta::FromMicroseconds(input->timestamp_usec)); 700 base::TimeDelta::FromMicroseconds(input->timestamp_usec));
698 CopyPlaneData(input->y_data.storage(), media::VideoFrame::kYPlane, frame); 701 CopyPlaneData(input->y_data.storage(), media::VideoFrame::kYPlane, frame);
699 CopyPlaneData(input->u_data.storage(), media::VideoFrame::kUPlane, frame); 702 CopyPlaneData(input->u_data.storage(), media::VideoFrame::kUPlane, frame);
700 CopyPlaneData(input->v_data.storage(), media::VideoFrame::kVPlane, frame); 703 CopyPlaneData(input->v_data.storage(), media::VideoFrame::kVPlane, frame);
701 704
702 return frame; 705 return frame;
703 } 706 }
704 707
705 } // namespace mojo 708 } // namespace mojo
OLDNEW
« no previous file with comments | « media/mojo/services/media_apptest.cc ('k') | media/mojo/services/media_type_converters_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698