Changeset 44518 for titan/titan/player.h

Timestamp:

01/15/20 14:13:22 (3 years ago)

Author:

obi

Message:

xx

File:

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

titan/titan/player.h

@@ -35 +35 @@
 #include <sched.h>
 #include <signal.h>
+#include <inttypes.h>
+#include <stdarg.h>
 
 #include <sys/ioctl.h>
@@ -43 +45 @@
 #include <sys/resource.h>
 #include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+
+#include <pthread.h>
 
 #include "common.h"
+#include "misc.h"
 
 extern int ffmpeg_av_dict_set(const char *key, const char *value, int flags);
@@ -54 +62 @@
 extern void      eac3_software_decoder_set(const int32_t val);
 extern void       mp3_software_decoder_set(const int32_t val);
+extern void       amr_software_decoder_set(const int32_t val);
+extern void    vorbis_software_decoder_set(const int32_t val);
+extern void      opus_software_decoder_set(const int32_t val);
+
 extern void            rtmp_proto_impl_set(const int32_t val);
 extern void        flv2mpeg4_converter_set(const int32_t val);
+extern void        sel_program_id_set(const int32_t val);
 
 extern void pcm_resampling_set(int32_t val);
@@ -111 +124 @@
         {
             TrackDescription_t *TrackList = NULL;
-            ptrManager->Command(player, MANAGER_LIST, &TrackList);
+            ptrManager->Command(g_player, MANAGER_LIST, &TrackList);
             if( NULL != TrackList) 
             {
                 int i = 0;
-                fprintf(stderr, "{\"%c_%c\": [", argvBuff[0], argvBuff[1]);
+                E2iStartMsg();
+                E2iSendMsg("{\"%c_%c\": [", argvBuff[0], argvBuff[1]);
                 for (i = 0; TrackList[i].Id >= 0; ++i) 
                 {
                     if(0 < i)
                     {
-                        fprintf(stderr, ", ");
+                        E2iSendMsg(", ");
                     }
-                    fprintf(stderr, "{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}", TrackList[i].Id , TrackList[i].Encoding, TrackList[i].Name);
+                    E2iSendMsg("{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}", TrackList[i].Id , TrackList[i].Encoding, TrackList[i].Name);
                     free(TrackList[i].Encoding);
                     free(TrackList[i].Name);
                 }
-                fprintf(stderr, "]}\n");
+                E2iSendMsg("]}\n");
+                E2iEndMsg();
                 free(TrackList);
             }
@@ -132 +147 @@
             {
                 // not tracks 
-                fprintf(stderr, "{\"%c_%c\": []}\n", argvBuff[0], argvBuff[1]);
+                E2iSendMsg("{\"%c_%c\": []}\n", argvBuff[0], argvBuff[1]);
             }
             break;
@@ -140 +155 @@
             
             TrackDescription_t *track = NULL;
-            ptrManager->Command(player, MANAGER_GET_TRACK_DESC, &track);
+            ptrManager->Command(g_player, MANAGER_GET_TRACK_DESC, &track);
             if (NULL != track) 
             {
                 if ('a' == argvBuff[0] || 's' == argvBuff[0])
                 {
-                    fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name);
+                    E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name);
                 }
                 else // video
                 {
-                    fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d,\"an\":%d,\"ad\":%d}}\n", \
+                    E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d,\"an\":%d,\"ad\":%d}}\n", \
                     argvBuff[0], argvBuff[1], track->Id , track->Encoding, track->Name, track->width, track->height, track->frame_rate, track->progressive, track->aspect_ratio_num, track->aspect_ratio_den);
                 }
@@ -161 +176 @@
                 if ('a' == argvBuff[0] || 's' == argvBuff[0])
                 {
-                    fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], -1, "", "");
+                    E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\"}}\n", argvBuff[0], argvBuff[1], -1, "", "");
                 }
                 else // video
                 {
-                    fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d}}\n", argvBuff[0], argvBuff[1], -1, "", "", -1, -1, 0, -1);
+                    E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"e\":\"%s\",\"n\":\"%s\",\"w\":%d,\"h\":%d,\"f\":%u,\"p\":%d}}\n", argvBuff[0], argvBuff[1], -1, "", "", -1, -1, 0, -1);
                 }
             }
@@ -184 +199 @@
                     {
                         TrackDescription_t *TrackList = NULL;
-                        ptrManager->Command(player, MANAGER_LIST, &TrackList);
+                        ptrManager->Command(g_player, MANAGER_LIST, &TrackList);
                         if( NULL != TrackList) 
                         {
@@ -212 +227 @@
                 if(id >= 0 || (1 == ok && id == -1))
                 {
-                    commandRetVal = player->playback->Command(player, playbackSwitchCmd, (void*)&id);
-                    fprintf(stderr, "{\"%c_%c\":{\"id\":%d,\"sts\":%d}}\n", argvBuff[0], 's', id, commandRetVal);
+                    commandRetVal = g_player->playback->Command(g_player, playbackSwitchCmd, (void*)&id);
+                    E2iSendMsg("{\"%c_%c\":{\"id\":%d,\"sts\":%d}}\n", argvBuff[0], 's', id, commandRetVal);
                 }
             }
@@ -223 +238 @@
 }
 
+
 static void UpdateVideoTrack()
 {
-    HandleTracks(player->manager->video, (PlaybackCmd_t)-1, "vc");
+    HandleTracks(g_player->manager->video, (PlaybackCmd_t)-1, "vc");
 }
 #endif