Refactored DecoderBuffer to use unix_hacker_style naming.

TBR: dmichael

Refactored DecoderBuffer to use unix_hacker_style naming.

DecoderBuffer went from having pure virtual methods to having
concrete implementations.  However, the style of the method name
remained in UpperCamelCase.  This patch renames the methods to fit
with the unix_hacker_style that is used for concrete implementations.

BUG=251986
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=212375

[Ty Overby, 2013-06-20 21:08:42]

In response to Issue 251986, this patch refactors DecoderBuffer to fit with the
google style guidelines.

[scherkus (not reviewing), 2013-06-20 21:26:59]

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h
File media/base/decoder_buffer.h (right):

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h#n...
media/base/decoder_buffer.h:48: static scoped_refptr<DecoderBuffer>
copy_from(const uint8* data, int size);
whoops! you changed too much :(

style guide states only simple getters/setters (like the ones below) get
unix_hacker style

complex methods are CamelCase (e.g., CopyFrom(), AsHumanReadableString())

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h#n...
media/base/decoder_buffer.h:61: static scoped_refptr<DecoderBuffer>
create_eos_buffer();
CreateEOSBuffer()

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h#n...
media/base/decoder_buffer.h:63: base::TimeDelta get_timestamp() const;
with unix_hacker style getters don't feature the "get_" prefix

can you change this to:
timestamp()
set_timestamp(...)

as well as the rest below

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h#n...
media/base/decoder_buffer.h:81: bool is_end_of_stream() const;
similar story with bools getters where we don't feature an "is_" prefix:

bool end_of_stream() const;

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer.h#n...
media/base/decoder_buffer.h:84: std::string as_human_readable_string();
revert this change

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer_uni...
File media/base/decoder_buffer_unittest.cc (right):

https://codereview.chromium.org/17408005/diff/1/media/base/decoder_buffer_uni...
media/base/decoder_buffer_unittest.cc:28: TEST(DecoderBufferTest, copy_from) {
ditto

https://codereview.chromium.org/17408005/diff/1/media/filters/ffmpeg_demuxer_...
File media/filters/ffmpeg_demuxer_unittest.cc (right):

https://codereview.chromium.org/17408005/diff/1/media/filters/ffmpeg_demuxer_...
media/filters/ffmpeg_demuxer_unittest.cc:37: MATCHER(is_end_of_streamBuffer,
revert this -- looks like it got included in some sort of global
search-and-replace ;)

https://codereview.chromium.org/17408005/diff/1/media/tools/demuxer_bench/dem...
File media/tools/demuxer_bench/demuxer_bench.cc (right):

https://codereview.chromium.org/17408005/diff/1/media/tools/demuxer_bench/dem...
media/tools/demuxer_bench/demuxer_bench.cc:37: virtual void
set_duration(base::TimeDelta duration) OVERRIDE {}
this shouldn't be part of your change

[Ty Overby, 2013-06-21 17:58:18]

Fixed previous refactor and accidental find/replace.

[scherkus (not reviewing), 2013-06-21 20:02:20]

fix all the if formatting stuff

[Ty Overby, 2013-06-21 20:58:45]

Style is now done according to the chromium style guide.

[scherkus (not reviewing), 2013-06-22 00:09:28]

few more accidental things slipped through

https://codereview.chromium.org/17408005/diff/22001/media/filters/chunk_demux...
File media/filters/chunk_demuxer.cc (right):

https://codereview.chromium.org/17408005/diff/22001/media/filters/chunk_demux...
media/filters/chunk_demuxer.cc:53: TimeDelta GetTimestampOffset() const { return
timestamp_offset_; }
wait -- I think this needs to be what it originally was

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_audi...
File media/filters/ffmpeg_audio_decoder.cc (right):

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_audi...
media/filters/ffmpeg_audio_decoder.cc:31: static inline bool end_of_stream(int
result, int decoded_size,
revert this change

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
File media/filters/ffmpeg_video_decoder.cc (right):

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
media/filters/ffmpeg_video_decoder.cc:75: if (format == VideoFrame::INVALID)
return AVERROR(EINVAL);
revert this change

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
media/filters/ffmpeg_video_decoder.cc:182: if (!read_cb_.is_null()) return;
revert this change

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
media/filters/ffmpeg_video_decoder.cc:199: if (state_ == kUninitialized) return;
revert this change

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
media/filters/ffmpeg_video_decoder.cc:201: if (!read_cb_.is_null())
base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
revert this change

https://codereview.chromium.org/17408005/diff/22001/media/filters/ffmpeg_vide...
media/filters/ffmpeg_video_decoder.cc:230: if (state_ == kUninitialized) return;
revert this change

[scherkus (not reviewing), 2013-06-22 00:39:17]

two tiny nits

https://codereview.chromium.org/17408005/diff/28001/media/filters/chunk_demux...
File media/filters/chunk_demuxer.cc (right):

https://codereview.chromium.org/17408005/diff/28001/media/filters/chunk_demux...
media/filters/chunk_demuxer.cc:53: TimeDelta GetTimestampOffset() const {
whoops -- this is still incorrect

the original code was as follows:
TimeDelta timestamp_offset() const { return timestamp_offset_; }

https://codereview.chromium.org/17408005/diff/28001/media/filters/ffmpeg_audi...
File media/filters/ffmpeg_audio_decoder.cc (right):

https://codereview.chromium.org/17408005/diff/28001/media/filters/ffmpeg_audi...
media/filters/ffmpeg_audio_decoder.cc:31: static inline bool end_of_stream(int
result,
this particular function should be reverted back to IsEndOfStream()

[Ty Overby, 2013-06-25 18:51:44]

Got rid of all the style changes and merged with the patch for DataBuffer.

[Ty Overby, 2013-07-08 23:24:20]

brettw, ping for review.

[scherkus (not reviewing), 2013-07-08 23:30:35]

https://codereview.chromium.org/17408005/diff/35001/media/base/decoder_buffer.h
File media/base/decoder_buffer.h (right):

https://codereview.chromium.org/17408005/diff/35001/media/base/decoder_buffer...
media/base/decoder_buffer.h:63: base::TimeDelta timestamp() const;
these should all be inline as discussed in 
https://chromiumcodereview.appspot.com/17315021

https://codereview.chromium.org/17408005/diff/35001/media/filters/decrypting_...
File media/filters/decrypting_demuxer_stream_unittest.cc (right):

https://codereview.chromium.org/17408005/diff/35001/media/filters/decrypting_...
media/filters/decrypting_demuxer_stream_unittest.cc:61: return
(arg->end_of_stream());
OOC do we need the ( ) here?

[Ty Overby, 2013-07-09 00:50:29]

PTAL

https://codereview.chromium.org/17408005/diff/35001/media/base/decoder_buffer.h
File media/base/decoder_buffer.h (right):

https://codereview.chromium.org/17408005/diff/35001/media/base/decoder_buffer...
media/base/decoder_buffer.h:63: base::TimeDelta timestamp() const;
On 2013/07/08 23:30:35, scherkus wrote:
> these should all be inline as discussed in 
> https://chromiumcodereview.appspot.com/17315021

Done.

https://codereview.chromium.org/17408005/diff/35001/media/filters/decrypting_...
File media/filters/decrypting_demuxer_stream_unittest.cc (right):

https://codereview.chromium.org/17408005/diff/35001/media/filters/decrypting_...
media/filters/decrypting_demuxer_stream_unittest.cc:61: return
(arg->end_of_stream());
On 2013/07/08 23:30:35, scherkus wrote:
> OOC do we need the ( ) here?

Done.

[scherkus (not reviewing), 2013-07-09 00:57:53]

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer.h
File media/base/decoder_buffer.h (right):

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:94: 
remove extra blank line

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:101: 
remove extra blank line

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:111: 
remove extra blank line

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:128: 
remove extra blank line

[Ty Overby, 2013-07-12 18:23:50]

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer.h
File media/base/decoder_buffer.h (right):

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:94: 
On 2013/07/09 00:57:53, scherkus wrote:
> remove extra blank line

Done.

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:101: 
On 2013/07/09 00:57:53, scherkus wrote:
> remove extra blank line

Done.

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:111: 
On 2013/07/09 00:57:53, scherkus wrote:
> remove extra blank line

Done.

https://codereview.chromium.org/17408005/diff/45001/media/base/decoder_buffer...
media/base/decoder_buffer.h:128: 
On 2013/07/09 00:57:53, scherkus wrote:
> remove extra blank line

Done.

[scherkus (not reviewing), 2013-07-12 18:24:51]

lgtm

[commit-bot: I haz the power, 2013-07-12 21:41:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/53001

[commit-bot: I haz the power, 2013-07-12 21:42:17]

Failed to apply patch for media/filters/decrypting_audio_decoder.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file media/filters/decrypting_audio_decoder.cc
  Hunk #1 FAILED at 311.
  Hunk #2 succeeded at 324 (offset -2 lines).
  Hunk #3 succeeded at 392 with fuzz 2 (offset -2 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
media/filters/decrypting_audio_decoder.cc.rej

Patch:       media/filters/decrypting_audio_decoder.cc
Index: media/filters/decrypting_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc
b/media/filters/decrypting_audio_decoder.cc
index
297e03fd97e20bcc30c976be8e2dd2d40955a38c..8af0140d2b5ddbcb0a7cc73ece922f99f35c3273
100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -311,9 +311,9 @@ void DecryptingAudioDecoder::DecryptAndDecodeBuffer(
 
   // Initialize the |next_output_timestamp_| to be the timestamp of the first
   // non-EOS buffer.
-  if (output_timestamp_base_ == kNoTimestamp() && !buffer->IsEndOfStream()) {
+  if (output_timestamp_base_ == kNoTimestamp() && !buffer->end_of_stream()) {
     DCHECK_EQ(total_samples_decoded_, 0);
-    output_timestamp_base_ = buffer->GetTimestamp();
+    output_timestamp_base_ = buffer->timestamp();
   }
 
   pending_buffer_to_decode_ = buffer;
@@ -326,8 +326,8 @@ void DecryptingAudioDecoder::DecodePendingBuffer() {
   DCHECK_EQ(state_, kPendingDecode) << state_;
 
   int buffer_size = 0;
-  if (!pending_buffer_to_decode_->IsEndOfStream()) {
-    buffer_size = pending_buffer_to_decode_->GetDataSize();
+  if (!pending_buffer_to_decode_->end_of_stream()) {
+    buffer_size = pending_buffer_to_decode_->data_size();
   }
 
   decryptor_->DecryptAndDecodeAudio(
@@ -394,7 +394,7 @@ void DecryptingAudioDecoder::DeliverFrame(
 
   if (status == Decryptor::kNeedMoreData) {
     DVLOG(2) << "DeliverFrame() - kNeedMoreData";
-    if (scoped_pending_buffer_to_decode->IsEndOfStream()) {
+    if (scoped_pending_buffer_to_decode->end_of_stream()) {
       state_ = kDecodeFinished;
       base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::CreateEOSBuffer());
       return;

[scherkus (not reviewing), 2013-07-13 01:11:07]

lgtm++

[commit-bot: I haz the power, 2013-07-13 01:11:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/62001

[commit-bot: I haz the power, 2013-07-13 01:22:19]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[commit-bot: I haz the power, 2013-07-15 16:48:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/62001

[commit-bot: I haz the power, 2013-07-15 16:48:59]

Failed to apply patch for media/filters/fake_demuxer_stream.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file media/filters/fake_demuxer_stream.cc
  Hunk #1 FAILED at 150.
  1 out of 1 hunk FAILED -- saving rejects to file
media/filters/fake_demuxer_stream.cc.rej

Patch:       media/filters/fake_demuxer_stream.cc
Index: media/filters/fake_demuxer_stream.cc
diff --git a/media/filters/fake_demuxer_stream.cc
b/media/filters/fake_demuxer_stream.cc
index
1d5915c39013f912b3e9a7b1335a1bc0f36e1b0a..78ff92953e99517218b08ecc673e0a136890e475
100644
--- a/media/filters/fake_demuxer_stream.cc
+++ b/media/filters/fake_demuxer_stream.cc
@@ -150,8 +150,8 @@ void FakeDemuxerStream::DoRead() {
       static_cast<const uint8*>(pickle.data()), pickle.size());
 
   // TODO(xhwang): Output out-of-order buffers if needed.
-  buffer->SetTimestamp(current_timestamp_);
-  buffer->SetDuration(duration_);
+  buffer->set_timestamp(current_timestamp_);
+  buffer->set_duration(duration_);
   current_timestamp_ += duration_;
 
   num_buffers_left_in_current_config_--;

[dmichael (off chromium), 2013-07-15 16:58:46]

webkit/plugins/ppapi lgtm

[commit-bot: I haz the power, 2013-07-15 17:47:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/72001

[commit-bot: I haz the power, 2013-07-15 17:47:55]

Failed to apply patch for
content/browser/speech/speech_recognizer_impl_android.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/speech/speech_recognizer_impl_android.cc
  Hunk #1 FAILED at 20.
  Hunk #2 FAILED at 46.
  2 out of 2 hunks FAILED -- saving rejects to file
content/browser/speech/speech_recognizer_impl_android.cc.rej

Patch:       content/browser/speech/speech_recognizer_impl_android.cc
Index: content/browser/speech/speech_recognizer_impl_android.cc
diff --git a/content/browser/speech/speech_recognizer_impl_android.cc
b/content/browser/speech/speech_recognizer_impl_android.cc
index
bb422cc3fdb80566546d9b5362e7d73b9d549c13..eb3f7934b7e9d40d3b4c7250d0a9c42a1ff86d49
100644
--- a/content/browser/speech/speech_recognizer_impl_android.cc
+++ b/content/browser/speech/speech_recognizer_impl_android.cc
@@ -20,6 +20,7 @@
 
 using base::android::AppendJavaStringArrayToStringVector;
 using base::android::AttachCurrentThread;
+using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 using base::android::JavaFloatArrayToFloatVector;
 
@@ -46,16 +47,17 @@ void SpeechRecognizerImplAndroid::StartRecognition(
       SpeechRecognitionManager::GetInstance()->GetSessionConfig(session_id());
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &content::SpeechRecognizerImplAndroid::StartRecognitionOnUIThread, this,
-      config.continuous, config.interim_results));
+      config.language, config.continuous, config.interim_results));
 }
 
 void SpeechRecognizerImplAndroid::StartRecognitionOnUIThread(
-    bool continuous, bool interim_results) {
+    std::string language, bool continuous, bool interim_results) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
   j_recognition_.Reset(Java_SpeechRecognition_createSpeechRecognition(env,
       GetApplicationContext(), reinterpret_cast<jint>(this)));
-  Java_SpeechRecognition_startRecognition(env, j_recognition_.obj(),
continuous,
+  Java_SpeechRecognition_startRecognition(env, j_recognition_.obj(),
+      ConvertUTF8ToJavaString(env, language).obj(), continuous,
       interim_results);
 }

[commit-bot: I haz the power, 2013-07-15 18:16:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/77001

[commit-bot: I haz the power, 2013-07-15 18:34:05]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[scherkus (not reviewing), 2013-07-15 19:26:56]

On 2013/07/15 18:34:05, I haz the power (commit-bot) wrote:
> Sorry for I got bad news for ya.
> Compile failed with a clobber build on android_clang_dbg.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
> Your code is likely broken or HEAD is junk. Please ensure your
> code is not broken then alert the build sheriffs.
> Look at the try server FAQ for more details.

Looks like it broke on some MP4-specific code.

Can you try adding proprietary_codecs=1 ffmpeg_branding=ChromeOS to your
GYP_DEFINES, regenerate the project files, and build again?

[commit-bot: I haz the power, 2013-07-15 19:34:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/99001

[commit-bot: I haz the power, 2013-07-15 20:24:18]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-07-15 20:24:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/108002

[commit-bot: I haz the power, 2013-07-15 21:15:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/116001

[commit-bot: I haz the power, 2013-07-15 23:53:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/127001

[commit-bot: I haz the power, 2013-07-16 05:19:13]

Retried try job too often on linux_aura for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-07-16 17:06:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/127001

[commit-bot: I haz the power, 2013-07-16 18:34:47]

Retried try job too often on linux_aura for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...

[commit-bot: I haz the power, 2013-07-17 17:46:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/151001

[commit-bot: I haz the power, 2013-07-17 19:33:39]

Sorry for I got bad news for ya.
Compile failed with a clobber build on ios_rel_device.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=ios_rel_de...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-07-17 19:34:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/170001

[commit-bot: I haz the power, 2013-07-17 23:08:53]

Retried try job too often on linux_rel for step(s) browser_tests,
content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

[commit-bot: I haz the power, 2013-07-17 23:39:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/195001

[commit-bot: I haz the power, 2013-07-18 04:51:16]

Retried try job too often on win7_aura for step(s) content_browsertests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-07-18 17:17:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tyoverby@chromium.org/17408005/195001

[commit-bot: I haz the power, 2013-07-18 18:49:45]

Change committed as 212375