* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "vda_internal.h"
+#include <pthread.h>
+#include <CoreFoundation/CFDictionary.h>
+#include <CoreFoundation/CFNumber.h>
+#include <CoreFoundation/CFData.h>
+#include <CoreFoundation/CFString.h>
-/**
- * \addtogroup VDA_Decoding
- *
- * @{
- */
-
-/* Mutex manager callback. */
-static int vda_lock_operation(void **mtx, enum AVLockOp op)
-{
- switch(op)
- {
- case AV_LOCK_CREATE:
- *mtx = av_malloc(sizeof(pthread_mutex_t));
- if(!*mtx)
- return 1;
- return !!pthread_mutex_init(*mtx, NULL);
- case AV_LOCK_OBTAIN:
- return !!pthread_mutex_lock(*mtx);
- case AV_LOCK_RELEASE:
- return !!pthread_mutex_unlock(*mtx);
- case AV_LOCK_DESTROY:
- pthread_mutex_destroy(*mtx);
- av_freep(mtx);
- return 0;
- }
- return 1;
-}
+#include "libavutil/avutil.h"
+#include "vda_internal.h"
/* Helper to create a dictionary according to the given pts. */
static CFDictionaryRef vda_dictionary_with_pts(int64_t i_pts)
{
CFStringRef key = CFSTR("FF_VDA_DECODER_PTS_KEY");
CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &i_pts);
- CFDictionaryRef user_info = CFDictionaryCreate( kCFAllocatorDefault,
- (const void **)&key,
- (const void **)&value,
- 1,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks);
+ CFDictionaryRef user_info = CFDictionaryCreate(kCFAllocatorDefault,
+ (const void **)&key,
+ (const void **)&value,
+ 1,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
CFRelease(value);
return user_info;
}
CFNumberRef pts;
int64_t outValue = 0;
- if (NULL == user_info)
+ if (!user_info)
return 0;
pts = CFDictionaryGetValue(user_info, CFSTR("FF_VDA_DECODER_PTS_KEY"));
{
vda_frame *top_frame;
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_OBTAIN);
+ pthread_mutex_lock(&vda_ctx->queue_mutex);
- while (vda_ctx->queue != NULL)
- {
+ while (vda_ctx->queue) {
top_frame = vda_ctx->queue;
vda_ctx->queue = top_frame->next_frame;
ff_vda_release_vda_frame(top_frame);
}
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_RELEASE);
+ pthread_mutex_unlock(&vda_ctx->queue_mutex);
}
vda_frame *new_frame;
vda_frame *queue_walker;
- if (NULL == image_buffer)
+ if (!image_buffer)
return;
if (vda_ctx->cv_pix_fmt_type != CVPixelBufferGetPixelFormatType(image_buffer))
return;
- new_frame = (vda_frame *)av_mallocz(sizeof(vda_frame));
+ new_frame = av_mallocz(sizeof(vda_frame));
+ if (!new_frame)
+ return;
+
new_frame->next_frame = NULL;
new_frame->cv_buffer = CVPixelBufferRetain(image_buffer);
new_frame->pts = vda_pts_from_dictionary(user_info);
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_OBTAIN);
+ pthread_mutex_lock(&vda_ctx->queue_mutex);
queue_walker = vda_ctx->queue;
- if (!queue_walker || (new_frame->pts < queue_walker->pts))
- {
+ if (!queue_walker || (new_frame->pts < queue_walker->pts)) {
/* we have an empty queue, or this frame earlier than the current queue head */
new_frame->next_frame = queue_walker;
vda_ctx->queue = new_frame;
- }
- else
- {
+ } else {
/* walk the queue and insert this frame where it belongs in display order */
vda_frame *next_frame;
- while (1)
- {
+ while (1) {
next_frame = queue_walker->next_frame;
- if (!next_frame || (new_frame->pts < next_frame->pts))
- {
+ if (!next_frame || (new_frame->pts < next_frame->pts)) {
new_frame->next_frame = next_frame;
queue_walker->next_frame = new_frame;
break;
}
}
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_RELEASE);
+ pthread_mutex_unlock(&vda_ctx->queue_mutex);
}
int ff_vda_create_decoder(struct vda_context *vda_ctx,
CFMutableDictionaryRef io_surface_properties;
CFNumberRef cv_pix_fmt;
- if (av_lockmgr_register(vda_lock_operation))
- return -1;
+ vda_ctx->bitstream = NULL;
+ vda_ctx->ref_size = 0;
+
+ pthread_mutex_init(&vda_ctx->queue_mutex, NULL);
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_CREATE);
+ if (extradata[4]==0xFE) {
+ // convert 3 byte NAL sizes to 4 byte
+ extradata[4] = 0xFF;
+ }
- config_info = (CFDictionaryCreateMutable(kCFAllocatorDefault,
- 4,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks));
+ config_info = CFDictionaryCreateMutable(kCFAllocatorDefault,
+ 4,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
height = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->height);
width = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vda_ctx->width);
CFDictionarySetValue(config_info, kVDADecoderConfiguration_SourceFormat, format);
CFDictionarySetValue(config_info, kVDADecoderConfiguration_avcCData, avc_data);
- buffer_attributes = (CFDictionaryCreateMutable(kCFAllocatorDefault,
- 2,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks));
- io_surface_properties = (CFDictionaryCreateMutable(kCFAllocatorDefault,
- 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks));
+ buffer_attributes = CFDictionaryCreateMutable(kCFAllocatorDefault,
+ 2,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
+ io_surface_properties = CFDictionaryCreateMutable(kCFAllocatorDefault,
+ 0,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
cv_pix_fmt = CFNumberCreate(kCFAllocatorDefault,
kCFNumberSInt32Type,
&vda_ctx->cv_pix_fmt_type);
kCVPixelBufferIOSurfacePropertiesKey,
io_surface_properties);
- status = VDADecoderCreate( config_info,
- buffer_attributes,
- (VDADecoderOutputCallback *)vda_decoder_callback,
- (void *)vda_ctx,
- &vda_ctx->decoder );
+ status = VDADecoderCreate(config_info,
+ buffer_attributes,
+ (VDADecoderOutputCallback *)vda_decoder_callback,
+ vda_ctx,
+ &vda_ctx->decoder);
CFRelease(height);
CFRelease(width);
vda_clear_queue(vda_ctx);
- if (vda_ctx->queue_mutex != NULL)
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_DESTROY);
+ pthread_mutex_destroy(&vda_ctx->queue_mutex);
+
+ if (vda_ctx->bitstream)
+ av_freep(&vda_ctx->bitstream);
if (kVDADecoderNoErr != status)
return status;
if (!vda_ctx->queue)
return NULL;
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_OBTAIN);
+ pthread_mutex_lock(&vda_ctx->queue_mutex);
top_frame = vda_ctx->queue;
vda_ctx->queue = top_frame->next_frame;
- vda_lock_operation(&vda_ctx->queue_mutex, AV_LOCK_RELEASE);
+ pthread_mutex_unlock(&vda_ctx->queue_mutex);
return top_frame;
}
void ff_vda_release_vda_frame(vda_frame *frame)
{
- if (frame != NULL)
- {
+ if (frame) {
CVPixelBufferRelease(frame->cv_buffer);
av_freep(&frame);
}
return 0;
}
-
-/* @} */
projects / ffmpeg / blobdiff