Use the new avcodec_decode_* API.

Patch by Thilo Borgmann name.surname AT googlemail.com. Originally committed as revision 18409 to svn://svn.ffmpeg.org/ffmpeg/trunk

Thilo Borgmann committed 17 years ago

Commit 4f313921 parent 655d47c1 file · +28 −23Browse files

Showing the changes to libavcodec/api-example.c (1 of 1 file). Show all

Unified · Split

libavcodec/api-example.c+28−23

 {
     AVCodec *codec;
     AVCodecContext *c= NULL;
-    int out_size, size, len;
+    int out_size, len;
     FILE *f, *outfile;
     uint8_t *outbuf;
-    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE], *inbuf_ptr;
+    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+    AVPacket avpkt;
+    av_init_packet(&avpkt);
     printf("Audio decoding\n");
     }
     /* decode until eof */
-    inbuf_ptr = inbuf;
+    avpkt.data = inbuf;
     for(;;) {
-        size = fread(inbuf, 1, INBUF_SIZE, f);
+        avpkt.size = fread(inbuf, 1, INBUF_SIZE, f);
-        if (size == 0)
+        if (avpkt.size == 0)
             break;
-        inbuf_ptr = inbuf;
+        avpkt.data = inbuf;
-        while (size > 0) {
+        while (avpkt.size > 0) {
             out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-            len = avcodec_decode_audio2(c, (short *)outbuf, &out_size,
+            len = avcodec_decode_audio3(c, (short *)outbuf, &out_size, &avpkt);
-                                       inbuf_ptr, size);
             if (len < 0) {
                 fprintf(stderr, "Error while decoding\n");
                 exit(1);
                 /* if a frame has been decoded, output it */
                 fwrite(outbuf, 1, out_size, outfile);
             }
-            size -= len;
+            avpkt.size -= len;
-            inbuf_ptr += len;
+            avpkt.data += len;
         }
     }
 {
     AVCodec *codec;
     AVCodecContext *c= NULL;
-    int frame, size, got_picture, len;
+    int frame, got_picture, len;
     FILE *f;
     AVFrame *picture;
-    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE], *inbuf_ptr;
+    uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
     char buf[1024];
+    AVPacket avpkt;
+    av_init_packet(&avpkt);
     /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */
     memset(inbuf + INBUF_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     frame = 0;
     for(;;) {
-        size = fread(inbuf, 1, INBUF_SIZE, f);
+        avpkt.size = fread(inbuf, 1, INBUF_SIZE, f);
-        if (size == 0)
+        if (avpkt.size == 0)
             break;
         /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio)
         /* here, we use a stream based decoder (mpeg1video), so we
            feed decoder and see if it could decode a frame */
-        inbuf_ptr = inbuf;
+        avpkt.data = inbuf;
-        while (size > 0) {
+        while (avpkt.size > 0) {
-            len = avcodec_decode_video(c, picture, &got_picture,
+            len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
-                                       inbuf_ptr, size);
             if (len < 0) {
                 fprintf(stderr, "Error while decoding frame %d\n", frame);
                 exit(1);
                          c->width, c->height, buf);
                 frame++;
             }
-            size -= len;
+            avpkt.size -= len;
-            inbuf_ptr += len;
+            avpkt.data += len;
         }
     }
     /* some codecs, such as MPEG, transmit the I and P frame with a
        latency of one frame. You must do the following to have a
        chance to get the last frame of the video */
-    len = avcodec_decode_video(c, picture, &got_picture,
+    avpkt.data = NULL;
-                               NULL, 0);
+    avpkt.size = 0;
+    len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
     if (got_picture) {
         printf("saving last frame %3d\n", frame);
         fflush(stdout);

Use the new avcodec_decode_* API.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code