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

Side by Side Diff: media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.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 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 #include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h" 5 #include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h"
6 6
7 #include <stdint.h>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "media/base/decrypt_config.h" 10 #include "media/base/decrypt_config.h"
9 #include "media/ffmpeg/ffmpeg_common.h" 11 #include "media/ffmpeg/ffmpeg_common.h"
10 #include "media/formats/mp4/avc.h" 12 #include "media/formats/mp4/avc.h"
11 #include "media/formats/mp4/box_definitions.h" 13 #include "media/formats/mp4/box_definitions.h"
12 #include "media/formats/mp4/hevc.h" 14 #include "media/formats/mp4/hevc.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 FFmpegH265ToAnnexBBitstreamConverter::FFmpegH265ToAnnexBBitstreamConverter( 18 FFmpegH265ToAnnexBBitstreamConverter::FFmpegH265ToAnnexBBitstreamConverter(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 memcpy(dest_packet.data, &input_frame[0], input_frame.size()); 86 memcpy(dest_packet.data, &input_frame[0], input_frame.size());
85 87
86 // At the end we must destroy the old packet. 88 // At the end we must destroy the old packet.
87 av_packet_unref(packet); 89 av_packet_unref(packet);
88 *packet = dest_packet; // Finally, replace the values in the input packet. 90 *packet = dest_packet; // Finally, replace the values in the input packet.
89 91
90 return true; 92 return true;
91 } 93 }
92 94
93 } // namespace media 95 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698