From c1b6c57346eb3d5f54d49064e663d33007ccb06a Mon Sep 17 00:00:00 2001 From: "don.darling" Date: Tue, 16 Nov 2010 20:46:26 +0000 Subject: Rename gst_tividenc1_circbuf_copy to gst_tividenc1_copy_input. More appropriate, since TIVidenc1 is now calling this function directly instead of using it as a callback function for the circular buffer. git-svn-id: https://gstreamer.ti.com/svn/gstreamer_ti/trunk@867 24075187-2e39-4e88-bbb8-bc8aa768f540 --- .../ti_build/ticodecplugin/src/gsttividenc1.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c index a1f1ff7..ab691c0 100644 --- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c +++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c @@ -949,14 +949,14 @@ exit: } /***************************************************************************** - * gst_tividenc1_circbuf_framecopy - * This function will be invoked by circular buffer during copy method. - * Function performs copy from source to destination buffer using - * DMAI framecopy module. + * gst_tividenc1_copy_input + * Make the input data in src available in the physically contiguous memory + * in dst in the best way possible. Preferably an accelerated copy or + * color conversion. ****************************************************************************/ -static Int gst_tividenc1_circbuf_copy (Int8 *dst, GstBuffer *src, void *data) +static Int +gst_tividenc1_copy_input(GstTIVidenc1 *videnc1, Int8 *dst, GstBuffer *src) { - GstTIVidenc1 *videnc1 = (GstTIVidenc1*) data; BufferGfx_Attrs gfxAttrs = BufferGfx_Attrs_DEFAULT; Buffer_Handle hInBuf = NULL; Buffer_Handle hOutBuf = NULL; @@ -997,7 +997,7 @@ static Int gst_tividenc1_circbuf_copy (Int8 *dst, GstBuffer *src, void *data) return GST_BUFFER_SIZE(src); } - GST_LOG("gst_tividenc1_circbuf_framecopy - begin\n"); + GST_LOG("gst_tividenc1_copy_input - begin\n"); if (videnc1->hFc == NULL) { /* Enable the accel framecopy based on contiguousInputFrame. @@ -1080,7 +1080,7 @@ exit: Buffer_delete(hOutBuf); } - GST_LOG("gst_tividenc1_circbuf_framecopy - end\n"); + GST_LOG("gst_tividenc1_copy_input - end\n"); return ret; } @@ -1621,8 +1621,8 @@ gst_tividenc1_encode(GstTIVidenc1 *videnc1, GstBuffer *inBuf, } /* Copy input buffer into physically-contiguous memory. */ - gst_tividenc1_circbuf_copy(Buffer_getUserPtr(videnc1->hContigInBuf), inBuf, - videnc1); + gst_tividenc1_copy_input(videnc1, Buffer_getUserPtr( + videnc1->hContigInBuf), inBuf); Buffer_setNumBytesUsed(videnc1->hContigInBuf, Buffer_getSize(videnc1->hContigInBuf)); -- cgit v1.2.3