Remove non-batching assumptions from SdkMediaCodecBridgeTest.DoNormal

media/base/android/sdk_media_codec_bridge_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 163 matching lines @@
 
   status = media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index);
   media_codec->QueueInputBuffer(input_buf_index, test_mp3, sizeof(test_mp3),
                                 base::TimeDelta::FromMicroseconds(++input_pts));
 
   status = media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index);
   media_codec->QueueEOS(input_buf_index);
 
   input_pts = kPresentationTimeBase;
   bool eos = false;
+  size_t total_size = 0;
   while (!eos) {
     size_t unused_offset = 0;
     size_t size = 0;
     base::TimeDelta timestamp;
     int output_buf_index = -1;
     status = media_codec->DequeueOutputBuffer(InfiniteTimeOut(),
                                               &output_buf_index, &unused_offset,
                                               &size, &timestamp, &eos, nullptr);
     switch (status) {
       case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
         FAIL();
         return;
 
       case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED:
         continue;
 
       case MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED:
         continue;
 
       default:
         break;
     }
     ASSERT_GE(output_buf_index, 0);
     EXPECT_LE(1u, size);
+    total_size += size;
     if (!eos)
       EXPECT_EQ(++input_pts, timestamp.InMicroseconds());

[qinmin, 2016/01/19 00:57:49]

should this also be removed? it is possible that the first output is for 2
inputs, and the 2nd output is for the 3rd input

[kraush, 2016/01/19 17:33:58]

Acknowledged.

     ASSERT_LE(input_pts, kPresentationTimeBase + 2);
   }
-  ASSERT_EQ(input_pts, kPresentationTimeBase + 2);
+  EXPECT_EQ(9216u, total_size);
+  ASSERT_LE(input_pts, kPresentationTimeBase + 2);
 }
 
 TEST(SdkMediaCodecBridgeTest, InvalidVorbisHeader) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   scoped_ptr<media::AudioCodecBridge> media_codec;
   media_codec.reset(AudioCodecBridge::Create(kCodecVorbis));
 
   // The first byte of the header is not 0x02.
   uint8_t invalid_first_byte[] = {0x00, 0xff, 0xff, 0xff, 0xff};
@@ skipping 70 matching lines @@
 }
 
 TEST(SdkMediaCodecBridgeTest, CreateUnsupportedCodec) {
   EXPECT_EQ(nullptr, AudioCodecBridge::Create(kUnknownAudioCodec));
   EXPECT_EQ(nullptr, VideoCodecBridge::CreateDecoder(kUnknownVideoCodec, false,
                                                      gfx::Size(320, 240),
                                                      nullptr, nullptr));
 }
 
 }  // namespace media