| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ffmpeg/ffmpeg_common.h" | 5 #include "media/ffmpeg/ffmpeg_common.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 12 #include "media/base/decoder_buffer.h" | 12 #include "media/base/decoder_buffer.h" |
| 13 #include "media/base/video_frame.h" | |
| 14 #include "media/base/video_util.h" | 13 #include "media/base/video_util.h" |
| 15 | 14 |
| 16 namespace media { | 15 namespace media { |
| 17 | 16 |
| 18 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are | 17 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are |
| 19 // padded. Check here to ensure FFmpeg only receives data padded to its | 18 // padded. Check here to ensure FFmpeg only receives data padded to its |
| 20 // specifications. | 19 // specifications. |
| 21 static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE, | 20 static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE, |
| 22 "DecoderBuffer padding size does not fit ffmpeg requirement"); | 21 "DecoderBuffer padding size does not fit ffmpeg requirement"); |
| 23 | 22 |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 return false; | 598 return false; |
| 600 | 599 |
| 601 *out = parsed_time; | 600 *out = parsed_time; |
| 602 return true; | 601 return true; |
| 603 } | 602 } |
| 604 | 603 |
| 605 return false; | 604 return false; |
| 606 } | 605 } |
| 607 | 606 |
| 608 } // namespace media | 607 } // namespace media |
| OLD | NEW |