Update libvpx snapshot to v0.9.7-p1 (Cayuga).

source/libvpx/vpx_mem/vpx_mem_tracker.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 18 matching lines @@
 #endif
 
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #elif defined(WIN32) || defined(_WIN32_WCE)
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # include <winbase.h>
 #elif defined(VXWORKS)
 # include <sem_lib.h>
-#elif defined(NDS_NITRO)
-# include <nitro.h>
-# include <nitro/os.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h> //VXWORKS doesn't have a malloc/memory.h file,
 //this should pull in malloc,free,etc.
 #include <stdarg.h>
 
 #include "include/vpx_mem_tracker.h"
 
@@ skipping 53 matching lines @@
         totalsize;
     unsigned int current_allocated,
              max_allocated;
 
 #if HAVE_PTHREAD_H
     pthread_mutex_t mutex;
 #elif defined(WIN32) || defined(_WIN32_WCE)
     HANDLE mutex;
 #elif defined(VXWORKS)
     SEM_ID mutex;
-#elif defined(NDS_NITRO)
-    OSMutex mutex;
 #elif defined(NO_MUTEX)
 #else
 #error "No mutex type defined for this platform!"
 #endif
 
     int padding_size,
         pad_value;
 };
 
 static struct memory_tracker memtrack;   //our global memory allocation list
@@ skipping 59 matching lines @@
                                      NULL);            /*mutex attributes (NULL=default)*/
 #elif defined(WIN32) || defined(_WIN32_WCE)
             memtrack.mutex = CreateMutex(NULL,   /*security attributes*/
                                           FALSE,  /*we don't want initial ownership*/
                                           NULL);  /*mutex name*/
             ret = !memtrack.mutex;
 #elif defined(VXWORKS)
             memtrack.mutex = sem_bcreate(SEM_Q_FIFO, /*SEM_Q_FIFO non-priority based mutex*/
                                          SEM_FULL);  /*SEM_FULL initial state is unlocked*/
             ret = !memtrack.mutex;
-#elif defined(NDS_NITRO)
-            os_init_mutex(&memtrack.mutex);
-            ret = 0;
 #elif defined(NO_MUTEX)
             ret = 0;
 #endif
 
             if (ret)
             {
                 memtrack_log("vpx_memory_tracker_init: Error creating mutex!\n");
 
                 MEM_TRACK_FREE(memtrack.head);
                 memtrack.head = NULL;
@@ skipping 35 matching lines @@
         }
 
         memtrack.head              = NULL;
         memtrack.tail              = NULL;
         memtrack.len               = 0;
         memtrack.current_allocated = 0;
         memtrack.max_allocated     = 0;
 
         if (!g_logging.type && g_logging.file && g_logging.file != stderr)
         {
-#if !defined(NDS_NITRO)
             fclose(g_logging.file);
-#endif
             g_logging.file = NULL;
         }
 
         memory_tracker_unlock_mutex();
 
         g_b_mem_tracker_inited = 0;
     }
 }
 
 /*
@@ skipping 94 matching lines @@
     switch (type)
     {
     case 0:
         g_logging.type = 0;
 
         if (!option)
         {
             g_logging.file = stderr;
             ret = 0;
         }
-
-#if !defined(NDS_NITRO)
         else
         {
             if ((g_logging.file = fopen((char *)option, "w")))
                 ret = 0;
         }
 
-#endif
         break;
 #if defined(WIN32) && !defined(_WIN32_WCE)
     case 1:
         g_logging.type = type;
         ret = 0;
         break;
 #endif
     default:
         break;
     }
@@ skipping 109 matching lines @@
             memtrack_log("memblocks[%d].addr= 0x%.8x, memblocks[%d].size= %d, file:\n"
                          "  %s(%d):\n", i,
                          p->addr, i, p->size,
                          p->file, p->line);
         else
 #endif
             memtrack_log("memblocks[%d].addr= 0x%.8x, memblocks[%d].size= %d, file: %s, line: %d\n", i,
                          p->addr, i, p->size,
                          p->file, p->line);
 
-#ifdef NDS_NITRO
-
-        if (!(i % 20)) os_sleep(500);
-
-#endif
-
         p = p->next;
         ++i;
     }
 
     memtrack_log("\n");
 }
 
 /*
     memory_tracker_check_integrity(char* file, unsigned int file)
       file - the file name where the check was placed
@@ skipping 187 matching lines @@
 
     if (g_b_mem_tracker_inited)
     {
 
 #if HAVE_PTHREAD_H
         ret = pthread_mutex_lock(&memtrack.mutex);
 #elif defined(WIN32) || defined(_WIN32_WCE)
         ret = WaitForSingleObject(memtrack.mutex, INFINITE);
 #elif defined(VXWORKS)
         ret = sem_take(memtrack.mutex, WAIT_FOREVER);
-#elif defined(NDS_NITRO)
-        os_lock_mutex(&memtrack.mutex);
-        ret = 0;
 #endif
 
         if (ret)
         {
             memtrack_log("memory_tracker_lock_mutex: mutex lock failed\n");
         }
     }
 
     return ret;
 }
@@ skipping 12 matching lines @@
 
     if (g_b_mem_tracker_inited)
     {
 
 #if HAVE_PTHREAD_H
         ret = pthread_mutex_unlock(&memtrack.mutex);
 #elif defined(WIN32) || defined(_WIN32_WCE)
         ret = !ReleaseMutex(memtrack.mutex);
 #elif defined(VXWORKS)
         ret = sem_give(memtrack.mutex);
-#elif defined(NDS_NITRO)
-        os_unlock_mutex(&memtrack.mutex);
-        ret = 0;
 #endif
 
         if (ret)
         {
             memtrack_log("memory_tracker_unlock_mutex: mutex unlock failed\n");
         }
     }
 
     return ret;
 }
@@ skipping 44 matching lines @@
     (void)g_malloc_l;
     (void)g_calloc_l;
     (void)g_realloc_l;
     (void)g_free_l;
     (void)g_memcpy_l;
     (void)g_memset_l;
     (void)g_memmove_l;
     return -1;
 #endif
 }