media/filters/opus_audio_decoder.h - Issue 111153003: FFmpeg fixups for M33 roll. Now with more Opus!

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/filters/opus_audio_decoder.h

Issue 111153003: FFmpeg fixups for M33 roll. Now with more Opus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add DEPS. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/opus_audio_decoder.cc » ('j') | media/filters/opus_audio_decoder.cc » ('J')

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 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_	5 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_

6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_	6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_

7	7

8 #include "base/callback.h"	8 #include "base/callback.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81	81

82 // Number of frames to be discarded at the start of the stream. This value	82 // Number of frames to be discarded at the start of the stream. This value

83 // is typically the CodecDelay value from the container.	83 // is typically the CodecDelay value from the container.

84 int frame_delay_at_start_;	84 int frame_delay_at_start_;

85	85

86 // Timestamp to be subtracted from all the frames. This is typically computed	86 // Timestamp to be subtracted from all the frames. This is typically computed

87 // from the CodecDelay value in the container.	87 // from the CodecDelay value in the container.

88 base::TimeDelta timestamp_offset_;	88 base::TimeDelta timestamp_offset_;

89	89

90 // Buffer for output from libopus.	90 // Buffer for output from libopus.

91 scoped_ptr<int16[]> output_buffer_;	91 scoped_ptr<float[]> output_buffer_;
	vignesh 2013/12/11 20:10:18 i believe you need to change this too: https://cod i believe you need to change this too: https://code.google.com/p/chromium/codesearch#chromium/src/media/ffmpeg/ffmpe... Also, we do a fixed point build for opus in android [1]. So may be this should be ifdef'd over !OS_ANDROID. [1] https://code.google.com/p/chromium/codesearch#chromium/src/third_party/opus/o... DaleCurtis 2013/12/11 22:19:36 I'm actually going to revert the float change out Show quoted text On 2013/12/11 20:10:18, vignesh wrote: > i believe you need to change this too: > https://code.google.com/p/chromium/codesearch#chromium/src/media/ffmpeg/ffmpe... > > Also, we do a fixed point build for opus in android [1]. So may be this should > be ifdef'd over !OS_ANDROID. > > [1] > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/opus/o... I'm actually going to revert the float change out of this patch set in favor of a bigger cleanup which removes all the extraneous memcpy's. All float changes now here: https://codereview.chromium.org/100503006/
92	92

93 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);	93 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);

94 };	94 };

95	95

96 } // namespace media	96 } // namespace media

97	97

98 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_	98 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_

OLD	NEW