| OLD | NEW | 
|    1 // Copyright 2016 The Chromium Authors. All rights reserved. |    1 // Copyright 2016 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 SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ |    5 #ifndef SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ | 
|    6 #define SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ |    6 #define SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ | 
|    7  |    7  | 
|    8 #include <ostream> |    8 #include <ostream> | 
|    9  |    9  | 
|   10 #include "services/media/framework/formatting.h" |   10 #include "services/media/framework/formatting.h" | 
|   11 extern "C" { |   11 extern "C" { | 
|   12 #include "third_party/ffmpeg/libavformat/avformat.h" |   12 #include "third_party/ffmpeg/libavformat/avformat.h" | 
|   13 } |   13 } | 
|   14  |   14  | 
|   15 namespace mojo { |   15 namespace mojo { | 
|   16 namespace media { |   16 namespace media { | 
|   17  |   17  | 
|   18 // See services/media/framework/ostream.h for details. |   18 // See services/media/framework/ostream.h for details. | 
|   19  |   19  | 
|   20 std::ostream& operator<<( |   20 std::ostream& operator<<(std::ostream& os, | 
|   21     std::ostream& os, |   21                          const struct AVCodecTag* const* value); | 
|   22     const struct AVCodecTag *const *value); |   22 std::ostream& operator<<(std::ostream& os, const AVInputFormat* value); | 
|   23 std::ostream& operator<<(std::ostream& os, const AVInputFormat *value); |   23 std::ostream& operator<<(std::ostream& os, const AVOutputFormat* value); | 
|   24 std::ostream& operator<<(std::ostream& os, const AVOutputFormat *value); |   24 std::ostream& operator<<(std::ostream& os, const AVIOContext* value); | 
|   25 std::ostream& operator<<(std::ostream& os, const AVIOContext *value); |   25 std::ostream& operator<<(std::ostream& os, const AVCodecContext* value); | 
|   26 std::ostream& operator<<(std::ostream& os, const AVCodecContext *value); |   26 std::ostream& operator<<(std::ostream& os, const AVCodec* value); | 
|   27 std::ostream& operator<<(std::ostream& os, const AVCodec *value); |  | 
|   28 std::ostream& operator<<(std::ostream& os, const AVRational& value); |   27 std::ostream& operator<<(std::ostream& os, const AVRational& value); | 
|   29 std::ostream& operator<<(std::ostream& os, const AVStream *value); |   28 std::ostream& operator<<(std::ostream& os, const AVStream* value); | 
|   30 std::ostream& operator<<(std::ostream& os, const AVBufferRef *value); |   29 std::ostream& operator<<(std::ostream& os, const AVBufferRef* value); | 
|   31 std::ostream& operator<<(std::ostream& os, const AVFrame *value); |   30 std::ostream& operator<<(std::ostream& os, const AVFrame* value); | 
|   32 std::ostream& operator<<(std::ostream& os, const AVPacket *value); |   31 std::ostream& operator<<(std::ostream& os, const AVPacket* value); | 
|   33 std::ostream& operator<<(std::ostream& os, const AVPacketSideData *value); |   32 std::ostream& operator<<(std::ostream& os, const AVPacketSideData* value); | 
|   34 std::ostream& operator<<(std::ostream& os, const AVProgram *value); |   33 std::ostream& operator<<(std::ostream& os, const AVProgram* value); | 
|   35 std::ostream& operator<<(std::ostream& os, const AVChapter *value); |   34 std::ostream& operator<<(std::ostream& os, const AVChapter* value); | 
|   36 std::ostream& operator<<(std::ostream& os, AVCodecID value); |   35 std::ostream& operator<<(std::ostream& os, AVCodecID value); | 
|   37 std::ostream& operator<<(std::ostream& os, const AVDictionary *value); |   36 std::ostream& operator<<(std::ostream& os, const AVDictionary* value); | 
|   38 std::ostream& operator<<(std::ostream& os, enum AVDiscard value); |   37 std::ostream& operator<<(std::ostream& os, enum AVDiscard value); | 
|   39 std::ostream& operator<<(std::ostream& os, AVDurationEstimationMethod value); |   38 std::ostream& operator<<(std::ostream& os, AVDurationEstimationMethod value); | 
|   40 std::ostream& operator<<(std::ostream& os, const AVFormatContext *value); |   39 std::ostream& operator<<(std::ostream& os, const AVFormatContext* value); | 
|   41 std::ostream& operator<<(std::ostream& os, AVMediaType value); |   40 std::ostream& operator<<(std::ostream& os, AVMediaType value); | 
|   42 std::ostream& operator<<(std::ostream& os, AVSampleFormat value); |   41 std::ostream& operator<<(std::ostream& os, AVSampleFormat value); | 
|   43 std::ostream& operator<<(std::ostream& os, AVColorSpace value); |   42 std::ostream& operator<<(std::ostream& os, AVColorSpace value); | 
|   44  |   43  | 
|   45 struct AVPacketSideDataArray { |   44 struct AVPacketSideDataArray { | 
|   46   AVPacketSideDataArray(const AVPacketSideData *items, unsigned int count) : |   45   AVPacketSideDataArray(const AVPacketSideData* items, unsigned int count) | 
|   47       items_(items), count_(count) {} |   46       : items_(items), count_(count) {} | 
|   48   const AVPacketSideData *items_; |   47   const AVPacketSideData* items_; | 
|   49   unsigned int count_; |   48   unsigned int count_; | 
|   50 }; |   49 }; | 
|   51 std::ostream& operator<<(std::ostream& os, const AVPacketSideDataArray& value); |   50 std::ostream& operator<<(std::ostream& os, const AVPacketSideDataArray& value); | 
|   52  |   51  | 
|   53 struct AVProgramArray { |   52 struct AVProgramArray { | 
|   54   AVProgramArray(AVProgram **items, unsigned int count) : |   53   AVProgramArray(AVProgram** items, unsigned int count) | 
|   55       items_(items), count_(count) {} |   54       : items_(items), count_(count) {} | 
|   56   AVProgram **items_; |   55   AVProgram** items_; | 
|   57   unsigned int count_; |   56   unsigned int count_; | 
|   58 }; |   57 }; | 
|   59 std::ostream& operator<<(std::ostream& os, const AVProgramArray& value); |   58 std::ostream& operator<<(std::ostream& os, const AVProgramArray& value); | 
|   60  |   59  | 
|   61 struct AVChapterArray { |   60 struct AVChapterArray { | 
|   62   AVChapterArray(AVChapter **items, unsigned int count) : |   61   AVChapterArray(AVChapter** items, unsigned int count) | 
|   63       items_(items), count_(count) {} |   62       : items_(items), count_(count) {} | 
|   64   AVChapter **items_; |   63   AVChapter** items_; | 
|   65   unsigned int count_; |   64   unsigned int count_; | 
|   66 }; |   65 }; | 
|   67 std::ostream& operator<<(std::ostream& os, const AVChapterArray& value); |   66 std::ostream& operator<<(std::ostream& os, const AVChapterArray& value); | 
|   68  |   67  | 
|   69 struct AVStreamArray { |   68 struct AVStreamArray { | 
|   70   AVStreamArray(AVStream **items, unsigned int count) : |   69   AVStreamArray(AVStream** items, unsigned int count) | 
|   71       items_(items), count_(count) {} |   70       : items_(items), count_(count) {} | 
|   72   AVStream **items_; |   71   AVStream** items_; | 
|   73   unsigned int count_; |   72   unsigned int count_; | 
|   74 }; |   73 }; | 
|   75 std::ostream& operator<<(std::ostream& os, const AVStreamArray& value); |   74 std::ostream& operator<<(std::ostream& os, const AVStreamArray& value); | 
|   76  |   75  | 
|   77 struct AVFMTFlags { |   76 struct AVFMTFlags { | 
|   78   AVFMTFlags(int flags) : flags_(flags) {} |   77   AVFMTFlags(int flags) : flags_(flags) {} | 
|   79   int flags_; |   78   int flags_; | 
|   80 }; |   79 }; | 
|   81 std::ostream& operator<<(std::ostream& os, AVFMTFlags value); |   80 std::ostream& operator<<(std::ostream& os, AVFMTFlags value); | 
|   82  |   81  | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
|  106  |  105  | 
|  107 struct AVFMT_AVOID_NEG_TSFlags { |  106 struct AVFMT_AVOID_NEG_TSFlags { | 
|  108   AVFMT_AVOID_NEG_TSFlags(int flags) : flags_(flags) {} |  107   AVFMT_AVOID_NEG_TSFlags(int flags) : flags_(flags) {} | 
|  109   int flags_; |  108   int flags_; | 
|  110 }; |  109 }; | 
|  111 std::ostream& operator<<(std::ostream& os, AVFMT_AVOID_NEG_TSFlags value); |  110 std::ostream& operator<<(std::ostream& os, AVFMT_AVOID_NEG_TSFlags value); | 
|  112  |  111  | 
|  113 }  // namespace media |  112 }  // namespace media | 
|  114 }  // namespace mojo |  113 }  // namespace mojo | 
|  115  |  114  | 
|  116 #endif // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ |  115 #endif  // SERVICES_MEDIA_FRAMEWORK_FFMPEG_FFMPEG_FORMATTING_H_ | 
| OLD | NEW |