Changeset 3509 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

Timestamp:

Apr 8, 2011 4:04:25 AM (14 years ago)

Author:

ming

Message:

Re #1213:

• Add pjmedia_frame_copy()
• Add converter for renderer videoport
• Add checking in SDL device since it may receive a frame size bigger than expected

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -734 +734 @@
     }
 
-    if (frame->size==0 || frame->buf==NULL)
+    if (frame->size==0 || frame->buf==NULL ||
+        frame->size < stream->vafp.framebytes)
         goto on_return;
 
@@ -746 +747 @@
         }
         
-        pj_memcpy(stream->surf->pixels, frame->buf, frame->size);
+        pj_memcpy(stream->surf->pixels, frame->buf,
+                  stream->vafp.framebytes);
         
         if (SDL_MUSTLOCK(stream->surf)) {