summaryrefslogtreecommitdiffstats
path: root/media/filters/ffmpeg_video_decoder.cc
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 20:46:25 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 20:46:25 +0000
commit025f804b7014f4f859cebbe9431942da42282cbd (patch)
tree5b3125fdf0b1e088b9d0ca2a2538c218f165370d /media/filters/ffmpeg_video_decoder.cc
parent09b1639499698897c778544f8701b6caad7bd220 (diff)
downloadchromium_src-025f804b7014f4f859cebbe9431942da42282cbd.zip
chromium_src-025f804b7014f4f859cebbe9431942da42282cbd.tar.gz
chromium_src-025f804b7014f4f859cebbe9431942da42282cbd.tar.bz2
Rename media::StreamSample::kInvalidTimestamp to media::kNoTimestamp.
Old name was overly verbose. BUG=54110 TEST=compiles Review URL: http://codereview.chromium.org/4877002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/filters/ffmpeg_video_decoder.cc')
-rw-r--r--media/filters/ffmpeg_video_decoder.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 7ce8f1d..1629e78 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -283,7 +283,7 @@ void FFmpegVideoDecoder::OnReadCompleteTask(scoped_refptr<Buffer> buffer) {
// TODO(ajwong): This push logic, along with the pop logic below needs to
// be reevaluated to correctly handle decode errors.
if (state_ == kNormal && !buffer->IsEndOfStream() &&
- buffer->GetTimestamp() != StreamSample::kInvalidTimestamp) {
+ buffer->GetTimestamp() != kNoTimestamp) {
pts_heap_.Push(buffer->GetTimestamp());
}
@@ -380,7 +380,7 @@ FFmpegVideoDecoder::TimeTuple FFmpegVideoDecoder::FindPtsAndDuration(
// situation and set the timestamp to kInvalidTimestamp.
DCHECK(frame);
base::TimeDelta timestamp = frame->GetTimestamp();
- if (timestamp != StreamSample::kInvalidTimestamp &&
+ if (timestamp != kNoTimestamp &&
timestamp.ToInternalValue() != 0) {
pts.timestamp = timestamp;
// We need to clean up the timestamp we pushed onto the |pts_heap|.
@@ -390,19 +390,19 @@ FFmpegVideoDecoder::TimeTuple FFmpegVideoDecoder::FindPtsAndDuration(
// If the frame did not have pts, try to get the pts from the |pts_heap|.
pts.timestamp = pts_heap->Top();
pts_heap->Pop();
- } else if (last_pts.timestamp != StreamSample::kInvalidTimestamp &&
- last_pts.duration != StreamSample::kInvalidTimestamp) {
+ } else if (last_pts.timestamp != kNoTimestamp &&
+ last_pts.duration != kNoTimestamp) {
// Guess assuming this frame was the same as the last frame.
pts.timestamp = last_pts.timestamp + last_pts.duration;
} else {
// Now we really have no clue!!! Mark an invalid timestamp and let the
// video renderer handle it (i.e., drop frame).
- pts.timestamp = StreamSample::kInvalidTimestamp;
+ pts.timestamp = kNoTimestamp;
}
// Fill in the duration, using the frame itself as the authoratative source.
base::TimeDelta duration = frame->GetDuration();
- if (duration != StreamSample::kInvalidTimestamp &&
+ if (duration != kNoTimestamp &&
duration.ToInternalValue() != 0) {
pts.duration = duration;
} else {