From: Fritz Koenig Date: Tue, 12 Jul 2011 23:29:15 +0000 (-0700) Subject: Remove rotting NDS_NITRO code. X-Git-Tag: v0.9.7~43^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d89eb6ad5a597b8651295326c9d5f31d4c392cd2;p=libvpx Remove rotting NDS_NITRO code. Code has not been used and is no longer relevant. Change-Id: I38590513da7c7a436804ff8a1a3805d9697f575d --- diff --git a/vpx_mem/include/nds/vpx_mem_nds.h b/vpx_mem/include/nds/vpx_mem_nds.h deleted file mode 100644 index e54f54d9b..000000000 --- a/vpx_mem/include/nds/vpx_mem_nds.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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. - */ - - -#ifndef __VPX_MEM_NDS_H__ -#define __VPX_MEM_NDS_H__ - -#if defined(__cplusplus) -extern "C" { -#endif - -#include -#include - - void *vpx_mem_nds_alloc(osarena_id id, osheap_handle handle, size_t size, size_t align); - void vpx_mem_nds_free(osarena_id id, osheap_handle handle, void *mem); - int vpx_nds_alloc_heap(osarena_id id, u32 size); - -#if defined(__cplusplus) -} -#endif - -#endif /*__VPX_MEM_NDS_H__*/ diff --git a/vpx_mem/vpx_mem_tracker.c b/vpx_mem/vpx_mem_tracker.c index 938ad0716..9e8623a9a 100644 --- a/vpx_mem/vpx_mem_tracker.c +++ b/vpx_mem/vpx_mem_tracker.c @@ -36,9 +36,6 @@ # include #elif defined(VXWORKS) # include -#elif defined(NDS_NITRO) -# include -# include #endif #include @@ -112,8 +109,6 @@ struct memory_tracker 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!" @@ -193,9 +188,6 @@ int vpx_memory_tracker_init(int padding_size, int pad_value) 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 @@ -251,9 +243,7 @@ void vpx_memory_tracker_destroy() if (!g_logging.type && g_logging.file && g_logging.file != stderr) { -#if !defined(NDS_NITRO) fclose(g_logging.file); -#endif g_logging.file = NULL; } @@ -368,15 +358,12 @@ int vpx_memory_tracker_set_log_type(int type, char *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: @@ -506,12 +493,6 @@ static void memory_tracker_dump() p->addr, i, p->size, p->file, p->line); -#ifdef NDS_NITRO - - if (!(i % 20)) os_sleep(500); - -#endif - p = p->next; ++i; } @@ -719,9 +700,6 @@ static int memory_tracker_lock_mutex() 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) @@ -754,9 +732,6 @@ static int memory_tracker_unlock_mutex() 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) diff --git a/vpx_scale/arm/nds/yv12extend.c b/vpx_scale/arm/nds/yv12extend.c deleted file mode 100644 index 48c0dfb33..000000000 --- a/vpx_scale/arm/nds/yv12extend.c +++ /dev/null @@ -1,221 +0,0 @@ -/* - * 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. - */ - - -/**************************************************************************** -* -* Module Title : yv12extend.c -* -* Description : -* -***************************************************************************/ - -/**************************************************************************** -* Header Files -****************************************************************************/ -#include "vpx_scale/yv12config.h" -#include "vpx_mem/vpx_mem.h" -#include -#include -#include - -//---- DMA Number -#define DMA_NO 3 - -/**************************************************************************** -* Exports -****************************************************************************/ - -/**************************************************************************** -* -****************************************************************************/ -void -vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf) -{ - int i; - unsigned char *src_ptr1, *src_ptr2; - unsigned char *dest_ptr1, *dest_ptr2; - - unsigned int Border; - int plane_stride; - int plane_height; - int plane_width; - - /***********/ - /* Y Plane */ - /***********/ - Border = ybf->border; - plane_stride = ybf->y_stride; - plane_height = ybf->y_height; - plane_width = ybf->y_width; - - // copy the left and right most columns out - src_ptr1 = ybf->y_buffer; - src_ptr2 = src_ptr1 + plane_width - 1; - dest_ptr1 = src_ptr1 - Border; - dest_ptr2 = src_ptr2 + 1; - - for (i = 0; i < plane_height; i++) - { - mi_cpu_fill8(dest_ptr1, src_ptr1[0], Border); - mi_cpu_fill8(dest_ptr2, src_ptr2[0], Border); - src_ptr1 += plane_stride; - src_ptr2 += plane_stride; - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } - - // Now copy the top and bottom source lines into each line of the respective borders - src_ptr1 = ybf->y_buffer - Border; - src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; - dest_ptr1 = src_ptr1 - (Border * plane_stride); - dest_ptr2 = src_ptr2 + plane_stride; - - for (i = 0; i < (int)Border; i++) - { - mi_cpu_copy_fast(src_ptr1, dest_ptr1, plane_stride); - mi_cpu_copy_fast(src_ptr2, dest_ptr2, plane_stride); - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } - - plane_stride /= 2; - plane_height /= 2; - plane_width /= 2; - Border /= 2; - - /***********/ - /* U Plane */ - /***********/ - - // copy the left and right most columns out - src_ptr1 = ybf->u_buffer; - src_ptr2 = src_ptr1 + plane_width - 1; - dest_ptr1 = src_ptr1 - Border; - dest_ptr2 = src_ptr2 + 1; - - for (i = 0; i < plane_height; i++) - { - mi_cpu_fill8(dest_ptr1, src_ptr1[0], Border); - mi_cpu_fill8(dest_ptr2, src_ptr2[0], Border); - src_ptr1 += plane_stride; - src_ptr2 += plane_stride; - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } - - // Now copy the top and bottom source lines into each line of the respective borders - src_ptr1 = ybf->u_buffer - Border; - src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; - dest_ptr1 = src_ptr1 - (Border * plane_stride); - dest_ptr2 = src_ptr2 + plane_stride; - - for (i = 0; i < (int)(Border); i++) - { - mi_cpu_copy_fast(src_ptr1, dest_ptr1, plane_stride); - mi_cpu_copy_fast(src_ptr2, dest_ptr2, plane_stride); - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } - - /***********/ - /* V Plane */ - /***********/ - - // copy the left and right most columns out - src_ptr1 = ybf->v_buffer; - src_ptr2 = src_ptr1 + plane_width - 1; - dest_ptr1 = src_ptr1 - Border; - dest_ptr2 = src_ptr2 + 1; - - for (i = 0; i < plane_height; i++) - { - mi_cpu_fill8(dest_ptr1, src_ptr1[0], Border); - mi_cpu_fill8(dest_ptr2, src_ptr2[0], Border); - src_ptr1 += plane_stride; - src_ptr2 += plane_stride; - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } - - // Now copy the top and bottom source lines into each line of the respective borders - src_ptr1 = ybf->v_buffer - Border; - src_ptr2 = src_ptr1 + (plane_height * plane_stride) - plane_stride; - dest_ptr1 = src_ptr1 - (Border * plane_stride); - dest_ptr2 = src_ptr2 + plane_stride; - - for (i = 0; i < (int)(Border); i++) - { - mi_cpu_copy_fast(src_ptr1, dest_ptr1, plane_stride); - mi_cpu_copy_fast(src_ptr2, dest_ptr2, plane_stride); - dest_ptr1 += plane_stride; - dest_ptr2 += plane_stride; - } -} - - - -/**************************************************************************** -* -* ROUTINE : vp8_yv12_copy_frame -* -* INPUTS : -* -* OUTPUTS : None. -* -* RETURNS : void -* -* FUNCTION : Copies the source image into the destination image and -* updates the destination's UMV borders. -* -* SPECIAL NOTES : The frames are assumed to be identical in size. -* -****************************************************************************/ -void -vp8_yv12_copy_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc) -{ - int yplane_size = (src_ybc->y_height + 2 * src_ybc->border) * (src_ybc->y_stride); - int mem_size = (yplane_size * 3 / 2) + (src_ybc->y_stride * 2); - - mi_cpu_copy_fast(src_ybc->buffer_alloc, dst_ybc->buffer_alloc, mem_size); - - /* unsigned char *src_y, *dst_y; - unsigned char *src_u, *dst_u; - unsigned char *src_v, *dst_v; - - int yheight, uv_height; - int ystride, uv_stride; - int border; - int yoffset, uvoffset; - - border = src_ybc->border; - yheight = src_ybc->y_height; - uv_height = src_ybc->uv_height; - - ystride = src_ybc->y_stride; - uv_stride = src_ybc->uv_stride; - - yoffset = border * (ystride + 1); - uvoffset = border/2 * (uv_stride + 1); - - src_y = src_ybc->y_buffer - yoffset; - dst_y = dst_ybc->y_buffer - yoffset; - src_u = src_ybc->u_buffer - uvoffset; - dst_u = dst_ybc->u_buffer - uvoffset; - src_v = src_ybc->v_buffer - uvoffset; - dst_v = dst_ybc->v_buffer - uvoffset; - - mi_cpu_copy_fast (src_y, dst_y, ystride * (yheight + 2 * border)); - mi_cpu_copy_fast (src_u, dst_u, uv_stride * (uv_height + border)); - mi_cpu_copy_fast (src_v, dst_v, uv_stride * (uv_height + border)); - */ -} - -#include