auto import from //depot/cupcake/@137055

Author: The Android Open Source Project

android/author/PVMediaRecorder.cpp

@@ -359,4 +359,13 @@ status_t PVMediaRecorder::close()
     return mAuthorDriverWrapper->enqueueCommand(ac, 0, 0);
 }
 
+status_t PVMediaRecorder::setListener(const sp<IMediaPlayerClient>& listener) {
+    LOGV("setListener");
+    if (mAuthorDriverWrapper == NULL) {
+        LOGE("author driver wrapper is not initialized yet");
+        return UNKNOWN_ERROR;
+    }
+    return mAuthorDriverWrapper->setListener(listener);
+}
+
 }; // namespace android

android/author/android_audio_input.cpp

@@ -1026,7 +1026,14 @@ void AndroidAudioInput::SendMicData(void)
     data_hdr.flags=0;
     data_hdr.duration = data.iDuration;
     data_hdr.stream_id=0;
-    uint32 writeAsyncID = iPeer->writeAsync(0, 0, data.iData, data.iDataLen, data_hdr);
+    uint32 writeAsyncID;
+    int32 error = OsclErrNone;
+    OSCL_TRY(error, writeAsyncID = iPeer->writeAsync(0, 0, data.iData, data.iDataLen, data_hdr););
+
+    if (OsclErrNone != error) {
+        iWriteResponseQueueLock.Unlock();
+        return;
+    }
 
     // Save the id and data pointer on iSentMediaData queue for writeComplete call
     AndroidAudioInputMediaData sentData;

android/author/android_camera_input.cpp

@@ -40,7 +40,7 @@ OSCL_DLL_ENTRY_POINT_DEFAULT()
 AndroidCameraInput::AndroidCameraInput()
     : OsclTimerObject(OsclActiveObject::EPriorityNominal, "AndroidCameraInput")
 {
-    LOGV("constructor");
+    LOGV("constructor(%p)", this);
     iCmdIdCounter = 0;
     iPeer = NULL;
     iThreadLoggedOn = false;
@@ -751,18 +751,21 @@ void AndroidCameraInput::Run()
     iFrameQueueMutex.Lock();
     while (!iFrameQueue.empty()) {
         AndroidCameraInputMediaData data = iFrameQueue[0];
-        iFrameQueue.erase(iFrameQueue.begin());
 
         uint32 writeAsyncID = 0;
-        int32 error = 0;
-        OSCL_TRY(error,writeAsyncID = iPeer->writeAsync(0, 0, (uint8*) (data.iFrameBuffer->pointer()),
+        int32 error = OsclErrNone;
+        OSCL_TRY(error,writeAsyncID = iPeer->writeAsync(PVMI_MEDIAXFER_FMT_TYPE_DATA, 0, (uint8*) (data.iFrameBuffer->pointer()),
                     data.iFrameSize, data.iXferHeader););
 
-        if (!error) {
-            data.iId = writeAsyncID;
-            iSentMediaData.push_back(data);
-            ++mFrameRefCount;
+        if (OsclErrNone != error) {
+            break;
         }
+
+        iFrameQueue.erase(iFrameQueue.begin());
+
+        data.iId = writeAsyncID;
+        iSentMediaData.push_back(data);
+        ++mFrameRefCount;
     }
     iFrameQueueMutex.Unlock();
     PVMFStatus status = PVMFFailure;
@@ -917,18 +920,30 @@ PVMFStatus AndroidCameraInput::DoInit()
 
     LOGD("Intended mFrameWidth=%d, mFrameHeight=%d ",mFrameWidth, mFrameHeight);
     String8 s = mCamera->getParameters();
+    if (s.length() == 0) {
+        LOGE("Failed to get camera(%p) parameters", mCamera.get());
+        return PVMFFailure;
+    }
     CameraParameters p(s);
     p.setPreviewSize(mFrameWidth, mFrameHeight);
     s = p.flatten();
-    mCamera->setParameters(s);
+    if (mCamera->setParameters(s) != NO_ERROR) {
+        LOGE("Failed to set camera(%p) parameters", mCamera.get());
+        return PVMFFailure;
+    }
 
     // Since we may not honor the preview size that app has requested
     // It is a good idea to get the actual preview size and used it
     // for video recording.
     CameraParameters newCameraParam(mCamera->getParameters());
     newCameraParam.getPreviewSize(&mFrameWidth, &mFrameHeight);
+    if (mFrameWidth < 0 || mFrameHeight < 0) {
+        LOGE("Failed to get camera(%p) preview size", mCamera.get());
+        return PVMFFailure;
+    }
     LOGD("Actual mFrameWidth=%d, mFrameHeight=%d ",mFrameWidth, mFrameHeight);
     if (mCamera->startPreview() != NO_ERROR) {
+        LOGE("Failed to start camera(%p) preview", mCamera.get());
         return PVMFFailure;
     }
     return PVMFSuccess;

android/author/authordriver.cpp

@@ -85,6 +85,13 @@ status_t AuthorDriverWrapper::enqueueCommand(author_command *ac, media_completio
     return NO_INIT;
 }
 
+status_t AuthorDriverWrapper::setListener(const sp<IMediaPlayerClient>& listener) {
+    if (mAuthorDriver) {
+        return mAuthorDriver->setListener(listener);
+    }
+    return NO_INIT;
+}
+
 AuthorDriver::AuthorDriver()
              : OsclActiveObject(OsclActiveObject::EPriorityNominal, "AuthorDriver"),
                mAuthor(NULL),
@@ -811,8 +818,11 @@ void AuthorDriver::HandleErrorEvent(const PVAsyncErrorEvent& aEvent)
 {
     LOGE("HandleErrorEvent(%d)", aEvent.GetEventType());
 
-    // FIXME:
-    // Send error event to client via callback
+    if (mListener != NULL) {
+        mListener->notify(
+                MEDIA_RECORDER_EVENT_ERROR, MEDIA_RECORDER_ERROR_UNKNOWN,
+                aEvent.GetEventType());
+    }
 }
 
 void AuthorDriver::HandleInformationalEvent(const PVAsyncInformationalEvent& aEvent)
@@ -837,4 +847,9 @@ PVAEState AuthorDriver::getAuthorEngineState()
     return PVAE_STATE_IDLE;
 }
 
+status_t AuthorDriver::setListener(const sp<IMediaPlayerClient>& listener) {
+    mListener = listener;
+
+    return android::OK;
+}
 

android/author/authordriver.h

@@ -218,6 +218,8 @@ public PVErrorEventObserver
     status_t getMaxAmplitude(int *max);
     PVAEState getAuthorEngineState();
 
+    status_t setListener(const sp<IMediaPlayerClient>& listener);
+
 private:
     // Finish up a non-async command in such a way that
     // the event loop will keep running.
@@ -275,6 +277,7 @@ public PVErrorEventObserver
     Mutex                   mQueueLock;
 
     sp<ICamera>             mCamera;
+    sp<IMediaPlayerClient>  mListener;
 };
 
 class AuthorDriverWrapper
@@ -284,6 +287,7 @@ class AuthorDriverWrapper
     ~AuthorDriverWrapper();
     status_t enqueueCommand(author_command *ec, media_completion_f comp, void *cookie);
     status_t getMaxAmplitude(int *max);
+    status_t setListener(const sp<IMediaPlayerClient>& listener);
 
 private:
     void resetAndClose();

android/mediascanner.cpp

@@ -594,6 +594,21 @@ status_t MediaScanner::doProcessDirectory(char *path, int pathRemaining, const c
         }
 
         int type = entry->d_type;
+        if (type == DT_UNKNOWN) {
+            // If the type is unknown, stat() the file instead.
+            // This is sometimes necessary when accessing NFS mounted filesystems, but
+            // could be needed in other cases well.
+            struct stat statbuf;
+            if (stat(path, &statbuf) == 0) {
+                if (S_ISREG(statbuf.st_mode)) {
+                    type = DT_REG;
+                } else if (S_ISDIR(statbuf.st_mode)) {
+                    type = DT_DIR;
+                }
+            } else {
+                LOGD("stat() failed for %s: %s", path, strerror(errno) );
+            }
+        }
         if (type == DT_REG || type == DT_DIR) {
             int nameLength = strlen(name);
             bool isDirectory = (type == DT_DIR);

codecs_v2/audio/mp3/dec/src/pvmp3_huffman_parsing.cpp

@@ -306,6 +306,10 @@ int32 pvmp3_huffman_parsing(int32 is[SUBBANDS_NUMBER*FILTERBANK_BANDS],
     if (pMainData->usedBits > grBits)
     {
         i -= 4;
+        if (i < 0 || i > SUBBANDS_NUMBER*FILTERBANK_BANDS - 4)
+        {
+            i = 0;
+        }
         is[i] = 0;
         is[(i+1)] = 0;
         is[(i+2)] = 0;

codecs_v2/omx/omx_common/src/pv_omxmastercore.cpp

@@ -15,6 +15,9 @@
  * and limitations under the License.
  * -------------------------------------------------------------------
  */
+
+#include <utils/threads.h>
+
 #include "pv_omxdefs.h"
 #include "omx_component.h"
 #include "pv_omxcore.h"
@@ -26,7 +29,7 @@
 #include "qc_omxcore.h"
 
 //Number of base instances
-OsclMutex g_OMX_Mutex;
+android::Mutex g_OMX_Mutex;
 OMX_U32 g_NumMasterOMXInstances = 0;
 void *g_Wrapper = NULL;
 void *g_MasterRegistry = NULL;
@@ -62,7 +65,7 @@ OMX_ERRORTYPE OMX_APIENTRY  PV_MasterOMX_Init()
     OMX_U32 index;
     OMX_U32 master_index = 0;
 
-    g_OMX_Mutex.Lock();
+    android::Mutex::Autolock l(g_OMX_Mutex);
     g_NumMasterOMXInstances++;
 
     if (g_NumMasterOMXInstances == 1)
@@ -72,7 +75,6 @@ OMX_ERRORTYPE OMX_APIENTRY  PV_MasterOMX_Init()
         PV_OMX_WrapperBase **pWrapper = (PV_OMX_WrapperBase **)malloc(NUMBER_OF_OMX_CORES * sizeof(PV_OMX_WrapperBase *));
         if (pWrapper == NULL)
         {
-            g_OMX_Mutex.Unlock();
             return OMX_ErrorInsufficientResources;
         }
         // set the global ptr to this array
@@ -81,15 +83,13 @@ OMX_ERRORTYPE OMX_APIENTRY  PV_MasterOMX_Init()
         PVOMXMasterRegistryStruct *pOMXMasterRegistry = (PVOMXMasterRegistryStruct *)malloc(MAX_NUMBER_OF_OMX_COMPONENTS * sizeof(PVOMXMasterRegistryStruct));
         if (pOMXMasterRegistry == NULL)
         {
-            g_OMX_Mutex.Unlock();
             return OMX_ErrorInsufficientResources;
         }
         g_MasterRegistry = (void*)pOMXMasterRegistry;
 
         PVOMXCompHandles *pOMXCompHandles = (PVOMXCompHandles *)malloc(MAX_NUMBER_OF_OMX_COMPONENTS * sizeof(PVOMXCompHandles));
         if (pOMXCompHandles == NULL)
         {
-            g_OMX_Mutex.Unlock();
             return OMX_ErrorInsufficientResources;
         }
         g_OMXCompHandles = (void*)pOMXCompHandles;
@@ -191,7 +191,6 @@ OMX_ERRORTYPE OMX_APIENTRY  PV_MasterOMX_Init()
         g_TotalNumOMXComponents = master_index;
     }
 
-    g_OMX_Mutex.Unlock();
     return OMX_ErrorNone;
 }
 
@@ -200,7 +199,7 @@ OMX_ERRORTYPE OMX_APIENTRY PV_MasterOMX_Deinit()
     OMX_U32 jj;
     OMX_ERRORTYPE Status = OMX_ErrorNone;
 
-    g_OMX_Mutex.Lock();
+    android::Mutex::Autolock l(g_OMX_Mutex);
     g_NumMasterOMXInstances--;
     if (g_NumMasterOMXInstances == 0)
     {
@@ -232,7 +231,6 @@ OMX_ERRORTYPE OMX_APIENTRY PV_MasterOMX_Deinit()
 
 
     }
-    g_OMX_Mutex.Unlock();
     return OMX_ErrorNone;
 }
 
@@ -246,11 +244,10 @@ OMX_API OMX_ERRORTYPE PV_MasterOMX_GetComponentsOfRole(
     OMX_U32 ii;
     // initialize
     *pNumComps = 0;
-    g_OMX_Mutex.Lock();
+    android::Mutex::Autolock l(g_OMX_Mutex);
     PVOMXMasterRegistryStruct *pOMXMasterRegistry = (PVOMXMasterRegistryStruct *) g_MasterRegistry;
     if (pOMXMasterRegistry == NULL)
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorNone;
     }
 
@@ -272,7 +269,6 @@ OMX_API OMX_ERRORTYPE PV_MasterOMX_GetComponentsOfRole(
         }
     }
 
-    g_OMX_Mutex.Unlock();
     return OMX_ErrorNone;
 
 }
@@ -287,17 +283,15 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY 	PV_MasterOMX_GetHandle(
     OMX_ERRORTYPE Status = OMX_ErrorNone;
     OMX_U32 ii, kk;
 
-    g_OMX_Mutex.Lock();
+    android::Mutex::Autolock l(g_OMX_Mutex);
     PVOMXMasterRegistryStruct *pOMXMasterRegistry = (PVOMXMasterRegistryStruct *) g_MasterRegistry;
     if (pOMXMasterRegistry == NULL)
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorComponentNotFound;
     }
     PVOMXCompHandles *pOMXCompHandles = (PVOMXCompHandles *)g_OMXCompHandles;
     if (pOMXCompHandles == NULL)
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorComponentNotFound;
     }
 
@@ -315,7 +309,6 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY 	PV_MasterOMX_GetHandle(
     if (ii == g_TotalNumOMXComponents)
     {
         // could not find a component with the given name
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorComponentNotFound;
     }
 
@@ -335,7 +328,6 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY 	PV_MasterOMX_GetHandle(
         }
         if (kk == MAX_NUMBER_OF_OMX_COMPONENTS)
         {
-            g_OMX_Mutex.Unlock();
             return OMX_ErrorComponentNotFound;
         }
 
@@ -347,12 +339,10 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY 	PV_MasterOMX_GetHandle(
             pOMXCompHandles[kk].handle = *pHandle;
             pOMXCompHandles[kk].OMXCoreIndex = index;
         }
-        g_OMX_Mutex.Unlock();
         return Status;
     }
     else
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorInsufficientResources;
     }
 
@@ -366,11 +356,10 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY PV_MasterOMX_FreeHandle(OMX_IN OMX_HANDLETYPE
 // here, we need to first find the handle among instantiated components
 // then we retrieve the core based on component handle
 // finally, call the OMX_FreeHandle for appropriate core
-    g_OMX_Mutex.Lock();
+    android::Mutex::Autolock l(g_OMX_Mutex);
     PVOMXCompHandles *pOMXCompHandles = (PVOMXCompHandles *)g_OMXCompHandles;
     if (pOMXCompHandles == NULL)
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorComponentNotFound;
     }
     for (ii = 0; ii < MAX_NUMBER_OF_OMX_COMPONENTS; ii ++)
@@ -386,7 +375,6 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY PV_MasterOMX_FreeHandle(OMX_IN OMX_HANDLETYPE
     if (ii == MAX_NUMBER_OF_OMX_COMPONENTS)
     {
         // could not find a component with the given name
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorComponentNotFound;
     }
 
@@ -398,12 +386,10 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY PV_MasterOMX_FreeHandle(OMX_IN OMX_HANDLETYPE
         Status = (*(pWrapper[index]->GetpOMX_FreeHandle()))(hComponent);
         //we're done with this, so get rid of the component handle
         pOMXCompHandles[ii].handle = NULL;
-        g_OMX_Mutex.Unlock();
         return Status;
     }
     else
     {
-        g_OMX_Mutex.Unlock();
         return OMX_ErrorInsufficientResources;
     }