Changeset 1916 for trunk/src/objects

Timestamp:

Oct 6, 2010 6:58:50 AM (14 years ago)

Author:

dkearney

Message:

switching from RpMediaPlayer? to RpVideo? code for the video viewer widget. changed flowdial widget so the dial moved as needed for the video widget.

Location:

trunk/src/objects

Files:

• Makefile.in (modified) (1 diff)
• RpMediaPlayer.cc (modified) (2 diffs)
• RpVideo.c (added)
• RpVideo.h (added)

trunk/src/objects/Makefile.in

@@ -116 +116 @@
   # include them in compilation
   LIBS += -lavcodec -lavformat -lswscale
-  HEADERS += RpMediaPlayer.h
-  OBJS += RpMediaPlayer.o
+  # HEADERS += RpMediaPlayer.h RpVideo.h
+  # OBJS += RpMediaPlayer.o RpVideo.o
+  HEADERS += RpVideo.h
+  OBJS += RpVideo.o
 endif
 

trunk/src/objects/RpMediaPlayer.cc

@@ -226 +226 @@
     return 0;
 }
+/*
+int packet_queue_put(PacketQueue *q, AVPacket *pkt) {
+
+  AVPacketList *pkt1;
+  if(pkt != &flush_pkt && av_dup_packet(pkt) < 0) {
+    return -1;
+  }
+    if(packet_queue_get(&is->audioq, pkt, 1) < 0) {
+      return -1;
+    }
+    if(packet->data == flush_pkt.data) {
+      avcodec_flush_buffers(is->audio_st->codec);
+      continue;
+    }
+*/
+
 
 int
@@ -231 +247 @@
 {
     // status.addContext("Rappture::MediaPlayer::seek()");
+    int stream_index= -1;
+    int64_t seek_target = is->seek_pos;
+
+    if (is->videoStream >= 0) {
+        stream_index = is->videoStream;
+    } else if (is->audioStream >= 0) {
+        stream_index = is->audioStream;
+    }
+
+    if(stream_index>=0){
+        seek_target= av_rescale_q(seek_target, AV_TIME_BASE_Q,
+                      pFormatCtx->streams[stream_index]->time_base);
+    }
+    if(av_seek_frame(is->pFormatCtx, stream_index, 
+                    seek_target, is->seek_flags) < 0) {
+        fprintf(stderr, "%s: error while seeking\n",
+            is->pFormatCtx->filename);
+    } else {
+        /* handle packet queues... more later... */
+        if(is->audioStream >= 0) {
+            packet_queue_flush(&is->audioq);
+            packet_queue_put(&is->audioq, &flush_pkt);
+        }
+        if(is->videoStream >= 0) {
+            packet_queue_flush(&is->videoq);
+            packet_queue_put(&is->videoq, &flush_pkt);
+        }
+    }
+    is->seek_req = 0;
     return 0;
 }