Changeset 44971

Timestamp:

12/08/20 20:35:48 (3 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/player.h (modified) (8 diffs)

titan/titan/player.h

@@ -133 +133 @@
 {
     funlockfile(stderr);
+}
+
+static void TerminateWakeUp()
+{
+    int ret = write(g_pfd[1], "x", 1);
+    if (ret != 1) {
+        printf("TerminateWakeUp write return %d\n", ret);
+    }
 }
 
@@ -1513 +1521 @@
 #endif
 
-                        player->container->selectedContainer->Command(player, CONTAINER_SET_BUFFER_SIZE, (void*)&size);
-                        player->container->selectedContainer->Command(player, CONTAINER_SET_BUFFER_SEEK_TIME, (void*)&seektime);
+//                      player->container->selectedContainer->Command(player, CONTAINER_SET_BUFFER_SIZE, (void*)&size);
+//                      player->container->selectedContainer->Command(player, CONTAINER_SET_BUFFER_SEEK_TIME, (void*)&seektime);                        
                 }
                 
@@ -1528 +1536 @@
                 player->output->Command(player, OUTPUT_ADD, "video");
                 player->output->Command(player, OUTPUT_ADD, "subtitle");
+#ifdef OEBUILD
+                player->output->Command(player, OUTPUT_SET_BUFFER_SIZE, (void*)&size);
+#endif
 #ifndef EXTEPLAYER3
                 //for subtitle
@@ -1549 +1560 @@
                 }
 #else
+                PlaybackDieNowRegisterCallback(TerminateWakeUp);
             player->manager->video->Command(player, MANAGER_REGISTER_UPDATED_TRACK_INFO, UpdateVideoTrack);
             if (strncmp(file, "rtmp", 4) && strncmp(file, "ffrtmp", 4))
@@ -1581 +1593 @@
                         return 1;
                 }
-#endif          
-
-
+#endif
                 player->output->Command(player, OUTPUT_OPEN, NULL);
                 player->playback->Command(player, PLAYBACK_PLAY, NULL);
@@ -2168 +2178 @@
 #ifdef EPLAYER3
         if(player && player->container && player->container->selectedContainer)
-                player->container->selectedContainer->Command(player, CONTAINER_GET_BUFFER_SIZE, (void*)&ret);
+//              player->container->selectedContainer->Command(player, CONTAINER_GET_BUFFER_SIZE, (void*)&ret);
+                player->output->Command(player, OUTPUT_GET_BUFFER_SIZE, &ret);
 #endif
 
@@ -2180 +2191 @@
 #ifdef EPLAYER3
         if(player && player->container && player->container->selectedContainer)
-                player->container->selectedContainer->Command(player, CONTAINER_GET_BUFFER_STATUS, (void*)&ret);
+//              player->container->selectedContainer->Command(player, CONTAINER_GET_BUFFER_STATUS, (void*)&ret);
+                player->output->Command(player, OUTPUT_GET_BUFFER_STATUS, &ret);
 #endif
 printf("playergetbufferstatus: %d\n", ret);
@@ -2294 +2306 @@
         if(player && player->playback)
                 player->playback->Command(player, PLAYBACK_CLOSE, NULL);
+
+        PlaybackDieNow(1);
 
 //      if((status.play == 0 || status.pause == 1) && subtitlethread != NULL)