Make hevc generic for all platforms

This commit is contained in:
Iwan Timmer
2016-03-14 16:39:44 +01:00
parent c1f5a2a30e
commit 0cab1f890a
3 changed files with 2 additions and 11 deletions
+1 -5
View File
@@ -63,9 +63,7 @@ static struct option long_options[] = {
{"surround", no_argument, NULL, 'u'}, {"surround", no_argument, NULL, 'u'},
{"fps", required_argument, NULL, 'v'}, {"fps", required_argument, NULL, 'v'},
{"forcehw", no_argument, NULL, 'w'}, {"forcehw", no_argument, NULL, 'w'},
#ifdef HAVE_AML {"forcehevc", no_argument, NULL, 'x'},
{"hevc", no_argument, NULL, 'x'},
#endif
{0, 0, 0, 0}, {0, 0, 0, 0},
}; };
@@ -203,11 +201,9 @@ static void parse_argument(int c, char* value, PCONFIGURATION config) {
case 'w': case 'w':
config->forcehw = true; config->forcehw = true;
break; break;
#ifdef HAVE_AML
case 'x': case 'x':
config->hevc = true; config->hevc = true;
break; break;
#endif
case 1: case 1:
if (config->action == NULL) if (config->action == NULL)
config->action = value; config->action = value;
-2
View File
@@ -43,9 +43,7 @@ typedef struct _CONFIGURATION {
bool forcehw; bool forcehw;
struct input_config inputs[MAX_INPUTS]; struct input_config inputs[MAX_INPUTS];
int inputsCount; int inputsCount;
#ifdef HAVE_AML
bool hevc; bool hevc;
#endif
} CONFIGURATION, *PCONFIGURATION; } CONFIGURATION, *PCONFIGURATION;
bool inputAdded; bool inputAdded;
+1 -4
View File
@@ -142,6 +142,7 @@ static void help() {
printf("\t-60fps\t\t\tUse 60fps [default]\n"); printf("\t-60fps\t\t\tUse 60fps [default]\n");
printf("\t-bitrate <bitrate>\tSpecify the bitrate in Kbps\n"); printf("\t-bitrate <bitrate>\tSpecify the bitrate in Kbps\n");
printf("\t-packetsize <size>\tSpecify the maximum packetsize in bytes\n"); printf("\t-packetsize <size>\tSpecify the maximum packetsize in bytes\n");
printf("\t-hevc \t\tUse high efficiency video decoding (HEVC)\n");
printf("\t-remote\t\t\tEnable remote optimizations\n"); printf("\t-remote\t\t\tEnable remote optimizations\n");
printf("\t-app <app>\t\tName of app to stream\n"); printf("\t-app <app>\t\tName of app to stream\n");
printf("\t-nosops\t\t\tDon't allow GFE to modify game settings\n"); printf("\t-nosops\t\t\tDon't allow GFE to modify game settings\n");
@@ -159,10 +160,6 @@ static void help() {
printf("\t-audio <device>\t\tUse <device> as ALSA audio output device (default sysdefault)\n"); printf("\t-audio <device>\t\tUse <device> as ALSA audio output device (default sysdefault)\n");
printf("\t-forcehw \t\tTry to use video hardware acceleration\n"); printf("\t-forcehw \t\tTry to use video hardware acceleration\n");
#endif #endif
#ifdef HAVE_AML
printf("\n Amlogic Codec options\n\n");
printf("\t-hevc \t\tUse high efficiency video decoding (HEVC)\n");
#endif
printf("\nUse Ctrl+Alt+Shift+Q to exit streaming session\n\n"); printf("\nUse Ctrl+Alt+Shift+Q to exit streaming session\n\n");
exit(0); exit(0);
} }