diff options
| -rw-r--r-- | rotord/av/avCodec.d | 66 | ||||
| -rw-r--r-- | rotord/av/avCodec.h | 35 | ||||
| -rw-r--r-- | rotord/rotord.cbp | 29 | ||||
| -rwxr-xr-x | rotord/rotord.cpp | 14 |
4 files changed, 75 insertions, 69 deletions
diff --git a/rotord/av/avCodec.d b/rotord/av/avCodec.d deleted file mode 100644 index 4bc3a37..0000000 --- a/rotord/av/avCodec.d +++ /dev/null @@ -1,66 +0,0 @@ -./avCodec.o: avCodec.cpp avCodec.h /usr/include/math.h \ - /usr/include/features.h /usr/include/i386-linux-gnu/bits/predefs.h \ - /usr/include/i386-linux-gnu/sys/cdefs.h \ - /usr/include/i386-linux-gnu/bits/wordsize.h \ - /usr/include/i386-linux-gnu/gnu/stubs.h \ - /usr/include/i386-linux-gnu/gnu/stubs-32.h \ - /usr/include/i386-linux-gnu/bits/huge_val.h \ - /usr/include/i386-linux-gnu/bits/huge_valf.h \ - /usr/include/i386-linux-gnu/bits/huge_vall.h \ - /usr/include/i386-linux-gnu/bits/inf.h \ - /usr/include/i386-linux-gnu/bits/nan.h \ - /usr/include/i386-linux-gnu/bits/mathdef.h \ - /usr/include/i386-linux-gnu/bits/mathcalls.h \ - /usr/include/i386-linux-gnu/bits/mathinline.h \ - ../ffmpeg/libavcodec/avcodec.h /usr/include/errno.h \ - /usr/include/i386-linux-gnu/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/i386-linux-gnu/asm/errno.h /usr/include/asm-generic/errno.h \ - /usr/include/asm-generic/errno-base.h ../ffmpeg/libavutil/samplefmt.h \ - /usr/lib/gcc/i686-linux-gnu/4.7/include/stdint.h /usr/include/stdint.h \ - /usr/include/i386-linux-gnu/bits/wchar.h ../ffmpeg/libavutil/avutil.h \ - ../ffmpeg/libavutil/common.h /usr/include/ctype.h \ - /usr/include/i386-linux-gnu/bits/types.h \ - /usr/include/i386-linux-gnu/bits/typesizes.h /usr/include/endian.h \ - /usr/include/i386-linux-gnu/bits/endian.h \ - /usr/include/i386-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \ - /usr/include/inttypes.h \ - /usr/lib/gcc/i686-linux-gnu/4.7/include-fixed/limits.h \ - /usr/lib/gcc/i686-linux-gnu/4.7/include-fixed/syslimits.h \ - /usr/include/limits.h /usr/include/i386-linux-gnu/bits/posix1_lim.h \ - /usr/include/i386-linux-gnu/bits/local_lim.h /usr/include/linux/limits.h \ - /usr/include/i386-linux-gnu/bits/posix2_lim.h \ - /usr/include/i386-linux-gnu/bits/xopen_lim.h \ - /usr/include/i386-linux-gnu/bits/stdio_lim.h /usr/include/stdio.h \ - /usr/lib/gcc/i686-linux-gnu/4.7/include/stddef.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/i686-linux-gnu/4.7/include/stdarg.h \ - /usr/include/i386-linux-gnu/bits/sys_errlist.h \ - /usr/include/i386-linux-gnu/bits/stdio.h \ - /usr/include/i386-linux-gnu/bits/stdio2.h /usr/include/stdlib.h \ - /usr/include/i386-linux-gnu/bits/waitflags.h \ - /usr/include/i386-linux-gnu/bits/waitstatus.h \ - /usr/include/i386-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/i386-linux-gnu/sys/select.h \ - /usr/include/i386-linux-gnu/bits/select.h \ - /usr/include/i386-linux-gnu/bits/sigset.h \ - /usr/include/i386-linux-gnu/bits/time.h \ - /usr/include/i386-linux-gnu/bits/select2.h \ - /usr/include/i386-linux-gnu/sys/sysmacros.h \ - /usr/include/i386-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/i386-linux-gnu/bits/stdlib.h /usr/include/string.h \ - /usr/include/i386-linux-gnu/bits/string3.h \ - ../ffmpeg/libavutil/attributes.h ../ffmpeg/libavutil/version.h \ - /usr/include/libavutil/avconfig.h ../ffmpeg/libavutil/mem.h \ - ../ffmpeg/libavutil/error.h ../ffmpeg/libavutil/mathematics.h \ - ../ffmpeg/libavutil/rational.h ../ffmpeg/libavutil/intfloat.h \ - ../ffmpeg/libavutil/intfloat_readwrite.h ../ffmpeg/libavutil/log.h \ - ../ffmpeg/libavutil/pixfmt.h ../ffmpeg/libavutil/version.h \ - ../ffmpeg/libavutil/old_pix_fmts.h ../ffmpeg/libavutil/avutil.h \ - ../ffmpeg/libavutil/cpu.h ../ffmpeg/libavutil/channel_layout.h \ - ../ffmpeg/libavutil/dict.h ../ffmpeg/libavutil/log.h \ - ../ffmpeg/libavutil/pixfmt.h ../ffmpeg/libavutil/rational.h \ - ../ffmpeg/libavcodec/version.h ../ffmpeg/libavcodec/old_codec_ids.h \ - ../ffmpeg/libavutil/common.h ../ffmpeg/libavutil/opt.h \ - ../ffmpeg/libavutil/dict.h ../ffmpeg/libavutil/samplefmt.h \ - ../ffmpeg/libavutil/imgutils.h ../ffmpeg/libavutil/pixdesc.h \ - ../ffmpeg/libavutil/mathematics.h diff --git a/rotord/av/avCodec.h b/rotord/av/avCodec.h new file mode 100644 index 0000000..7e1815a --- /dev/null +++ b/rotord/av/avCodec.h @@ -0,0 +1,35 @@ +// libav includes +// from /usr/include + +extern "C" { + #ifndef __STDC_CONSTANT_MACROS + # define __STDC_CONSTANT_MACROS + #endif + + #ifndef UINT64_C + #define UINT64_C(c) (c ## ULL) + #endif + + #include <math.h> + + #include "libavcodec/avcodec.h" + + #include "libavutil/opt.h" + #include "libavutil/channel_layout.h" + #include "libavutil/common.h" + #include "libavutil/imgutils.h" + #include "libavutil/mathematics.h" + #include "libavutil/samplefmt.h" +} + +namespace avCodec { + static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt); + static int select_sample_rate(AVCodec *codec); + static int select_channel_layout(AVCodec *codec); + static void audio_encode_example(const char *filename); + static void audio_decode_example(const char *outfilename, const char *filename); + static void video_encode_example(const char *filename, int codec_id); + static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,char *filename); + static int decode_write_frame(const char *outfilename, AVCodecContext *avctx,AVFrame *frame, int *frame_count, AVPacket *pkt, int last); + static void video_decode_example(const char *outfilename, const char *filename); +}
\ No newline at end of file diff --git a/rotord/rotord.cbp b/rotord/rotord.cbp index e776043..5baac29 100644 --- a/rotord/rotord.cbp +++ b/rotord/rotord.cbp @@ -3,21 +3,30 @@ <FileVersion major="1" minor="6" /> <Project> <Option title="rotord" /> + <Option makefile_is_custom="1" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="rotord" prefix_auto="1" extension_auto="1" /> - <Option object_output="/home/tim/workspace/rotor/rotord//.objs" /> + <Option object_output="/home/tim/workspace/rotor/rotord/.objs" /> <Option type="1" /> <Option compiler="gcc" /> <Compiler> <Add option="-g" /> </Compiler> + <MakeCommands> + <Build command="$make -f $makefile $target" /> + <CompileFile command="$make -f $makefile $file" /> + <Clean command="$make -f $makefile clean" /> + <DistClean command="$make -f $makefile distclean$target" /> + <AskRebuildNeeded command="$make -q -f $makefile $target" /> + <SilentBuild command="$make -s -f $makefile $target" /> + </MakeCommands> </Target> <Target title="Release"> <Option output="rotord" prefix_auto="1" extension_auto="1" /> - <Option object_output="/home/tim/workspace/rotor/rotord//.objs" /> + <Option object_output="/home/tim/workspace/rotor/rotord/.objs" /> <Option type="1" /> <Option compiler="gcc" /> <Compiler> @@ -26,11 +35,27 @@ <Linker> <Add option="-s" /> </Linker> + <MakeCommands> + <Build command="$make -f $makefile $target" /> + <CompileFile command="$make -f $makefile $file" /> + <Clean command="$make -f $makefile clean" /> + <DistClean command="$make -f $makefile distclean$target" /> + <AskRebuildNeeded command="$make -q -f $makefile $target" /> + <SilentBuild command="$make -s -f $makefile $target" /> + </MakeCommands> </Target> </Build> <Compiler> <Add option="-Wall" /> </Compiler> + <Unit filename="Makefile" /> + <Unit filename="rotor.h" /> + <Unit filename="rotord.cpp" /> + <Unit filename="rotord.h" /> + <Unit filename="rotord.xml" /> + <Unit filename="system.h" /> + <Unit filename="vampHost.cpp" /> + <Unit filename="vampHost.h" /> <Extensions> <envvars /> <code_completion /> diff --git a/rotord/rotord.cpp b/rotord/rotord.cpp index f9e1d21..e04ba30 100755 --- a/rotord/rotord.cpp +++ b/rotord/rotord.cpp @@ -171,9 +171,10 @@ HTTPRequestHandler* RotorRequestHandlerFactory::createRequestHandler(const HTTPS } else { bool found=false; - for (auto& task: manager.taskList()) + for (auto& task: manager.taskList()) //c++11 { if(task->name()==command[0]) { + //valid session command found=true; if (command.size()==1) { //just invoking sID @@ -186,6 +187,17 @@ HTTPRequestHandler* RotorRequestHandlerFactory::createRequestHandler(const HTTPS content="<status>Rotor: render context invoked with no command</status>\n"; } } + else { + if (command[0]=="audio") { + if (request.getMethod()=="PUT") { + //get audio file location and initiate analysis + stringstream str; + str << request.stream(); + content << str; + } + } + + } } } if (!found) { |