am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop...

* commit 'f8af99b7c10f1441d9a52676724b168f20752270':
  stagefright: synchronously change nativewindow crop

diff --cc include/media/stagefright/ACodec.h
Simple merge

diff --cc media/libstagefright/ACodec.cpp
index a60c320,cf41cf2..bf650b4
--- 1/media/libstagefright/ACodec.cpp
--- 2/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@@ -3090,19 -3055,14 +3088,22 @@@ bool ACodec::BaseState::onOMXFillBuffer
                  break;
              }
  
+             sp<AMessage> reply =
+                 new AMessage(kWhatOutputBufferDrained, mCodec->id());
+ 
              if (!mCodec->mSentFormat) {
-                 mCodec->sendFormatChange();
+                 mCodec->sendFormatChange(reply);
              }
  
 -            info->mData->setRange(rangeOffset, rangeLength);
 +            if (mCodec->mUseMetadataOnEncoderOutput) {
 +                native_handle_t* handle =
 +                        *(native_handle_t**)(info->mData->data() + 4);
 +                info->mData->meta()->setPointer("handle", handle);
 +                info->mData->meta()->setInt32("rangeOffset", rangeOffset);
 +                info->mData->meta()->setInt32("rangeLength", rangeLength);
 +            } else {
 +                info->mData->setRange(rangeOffset, rangeLength);
 +            }
  #if 0
              if (mCodec->mNativeWindow == NULL) {
                  if (IsIDR(info->mData)) {