WebSVN – Kolibri OS – Diff – /contrib/media/fplay/fplay.c

 #include "sound.h"
 #include "fplay.h"
-#ifdef HAVE_VAAPI
-int va_check_codec_support(enum AVCodecID id);
-#endif
 volatile enum player_state player_state  = STOP;
 volatile enum player_state decoder_state = PREPARE;
 volatile enum player_state sound_state   = STOP;
 uint32_t win_width, win_height;
-int      have_sound = 0;
 int have_sound = 0;
-uint8_t  *decoder_buffer;
-extern int resampler_size;
-extern int sample_rate;
 char *movie_file;
 uint8_t  *decoder_buffer;
-void flush_video(vst_t* vst);
+extern int resampler_size;
 extern int sample_rate;
-int64_t  rewind_pos;
-int64_t stream_duration;
-int threads_running = DECODER_THREAD;
-extern double audio_base;
+int64_t  rewind_pos;
 int64_t stream_duration;
 double get_audio_base(vst_t* vst)
 int threads_running = DECODER_THREAD;
     return (double)av_q2d(vst->fCtx->streams[vst->aStream]->time_base)*1000;
-};
+extern double audio_base;
 int main( int argc, char *argv[])
+{
     static vst_t vst;
     int i, ret;
     char *file_name, *dot;
     if(argc < 2)
+    {
-        movie_file = get_moviefile();
+        vst.input_file = get_moviefile();
-        if(movie_file == NULL)
+        if(vst.input_file == NULL)
         {
             printf("Please provide a movie file\n");
             return -1;
+        }
+    }
-    else movie_file = argv[1];
+    else vst.input_file = argv[1];
         printf("Cannot find streams\n\r");
         return -1;
     };
-    file_name = strrchr(movie_file,'/')+1;
+    file_name = strrchr(vst.input_file,'/')+1;
     dot = strrchr(file_name,'.');
     if(dot)
+    {
-        movie_file = malloc(dot-file_name+1);
+        vst.input_name = malloc(dot-file_name+1);
-        memcpy(movie_file, file_name, dot-file_name);
+        memcpy(vst.input_name, file_name, dot-file_name);
-        movie_file[dot-file_name] = 0;
+        vst.input_name[dot-file_name] = 0;
+    }
-    else movie_file = file_name;
+    else vst.input_name = file_name;
     stream_duration = vst.fCtx->duration;
         if(vst.fCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO
             && vst.vStream < 0)
+        {
             vst.vStream = i;
-            video_time_base = vst.fCtx->streams[i]->time_base;
+            vst.video_time_base = vst.fCtx->streams[i]->time_base;
             if(stream_duration == 0)
                stream_duration = vst.fCtx->streams[i]->duration;
+        }
         if(vst.fCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_AUDIO &&
            vst.aStream < 0)
+        {
             vst.aStream = i;
+            vst.audio_time_base = vst.fCtx->streams[i]->time_base;
             if(stream_duration == 0)
                stream_duration = vst.fCtx->streams[i]->duration;
+        }
+    }
     vst.vCtx = vst.fCtx->streams[vst.vStream]->codec;
     vst.aCtx = vst.fCtx->streams[vst.aStream]->codec;
     vst.vCodec = avcodec_find_decoder(vst.vCtx->codec_id);
-    printf("codec id %x name %s\n",vst.vCtx->codec_id, vst.vCodec->name);
-    printf("ctx->pix_fmt %d\n", vst.vCtx->pix_fmt);
     INIT_LIST_HEAD(&vst.input_list);
     INIT_LIST_HEAD(&vst.output_list);
     mutex_init(&vst.q_video.lock);
     if(vst.vCodec == NULL)
+    {
         printf("Unsupported codec with id %d for input stream %d\n",
         vst.vCtx->codec_id, vst.vStream);
-        return -1; // Codec not found
+        return -1;
+    }
+    vst.Frame = av_frame_alloc();
+    if(vst.Frame == NULL)
+    {
+        printf("Cannot alloc video frame\n");
+        return -1;
+    };
     if(fplay_init_context(&vst))
         return -1;
     if(avcodec_open2(vst.vCtx, vst.vCodec, NULL) < 0)
+    {
         printf("Error while opening codec for input stream %d\n",
                 vst.vStream);
-        return -1; // Could not open codec
-    };
         return -1; // Could not open codec
-    printf("ctx->pix_fmt %d\n", vst.vCtx->pix_fmt);
+    };
     if (vst.aCtx->channels > 0)
         else printf("Cannot open audio codec\n\r");
+    }
     else printf("Unsupported audio codec!\n");
-    if(!init_video(&vst))
+    mutex_lock(&vst.decoder_lock);
-        return 0;
+    create_thread(video_thread, &vst, 1024*1024);
-    mutex_lock_timeout(&vst.decoder_lock, 3000);
+    if(mutex_lock_timeout(&vst.decoder_lock, 3000) == 0)
+        return -1;
     decoder(&vst);
                     };
                     delay(1);
                     continue;
+                }
                 yield();
-                yield();
                 continue;
             case STOP:
                 delay(1);

Subversion Repositories Kolibri OS

(root)/contrib/media/fplay/fplay.c – Rev 6133 → 6136