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

Unified Diff: services/media/framework_ffmpeg/ffmpeg_video_decoder.h

Issue 1822333002: Motown: wholesale clang-format (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: dalesat Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: services/media/framework_ffmpeg/ffmpeg_video_decoder.h
diff --git a/services/media/framework_ffmpeg/ffmpeg_video_decoder.h b/services/media/framework_ffmpeg/ffmpeg_video_decoder.h
index 3d3d4f790c43a675565a0a72c618ecdb0fe92f48..dc853920d5c1808cdf79a596980ad85bdae98367 100644
--- a/services/media/framework_ffmpeg/ffmpeg_video_decoder.h
+++ b/services/media/framework_ffmpeg/ffmpeg_video_decoder.h
@@ -20,24 +20,21 @@ class FfmpegVideoDecoder : public FfmpegDecoderBase {
protected:
// FfmpegDecoderBase overrides.
- int Decode(
- const AVPacket& av_packet,
- const ffmpeg::AvFramePtr& av_frame_ptr,
- PayloadAllocator* allocator,
- bool* frame_decoded_out) override;
+ int Decode(const AVPacket& av_packet,
+ const ffmpeg::AvFramePtr& av_frame_ptr,
+ PayloadAllocator* allocator,
+ bool* frame_decoded_out) override;
- PacketPtr CreateOutputPacket(
- const AVFrame& av_frame,
- PayloadAllocator* allocator) override;
+ PacketPtr CreateOutputPacket(const AVFrame& av_frame,
+ PayloadAllocator* allocator) override;
PacketPtr CreateOutputEndOfStreamPacket() override;
private:
// Callback used by the ffmpeg decoder to acquire a buffer.
- static int AllocateBufferForAvFrame(
- AVCodecContext* av_codec_context,
- AVFrame* av_frame,
- int flags);
+ static int AllocateBufferForAvFrame(AVCodecContext* av_codec_context,
+ AVFrame* av_frame,
+ int flags);
// Callback used by the ffmpeg decoder to release a buffer.
static void ReleaseBufferForAvFrame(void* opaque, uint8_t* buffer);
@@ -48,10 +45,10 @@ class FfmpegVideoDecoder : public FfmpegDecoderBase {
// This is used to verify that an allocated buffer is being used as expected
// by ffmpeg avcodec_decode_audio4. AllocateBufferForAvFrame sets it.
- //void* packet_buffer_;
+ // void* packet_buffer_;
};
} // namespace media
} // namespace mojo
-#endif // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_
+#endif // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_VIDEO_DECODER_H_
« no previous file with comments | « services/media/framework_ffmpeg/ffmpeg_init.cc ('k') | services/media/framework_ffmpeg/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698