Merge branch 'master' of git://github.com/maxlapshin/erlyvideo

Emakefile

@@ -3,6 +3,7 @@
 {"src/apps/*", [{d, debug}, {outdir, "ebin"}, {i, "include"}]}.
 {"src/media/*", [{d, debug}, {outdir, "ebin"}, {i, "include"}]}.
 {"src/formats/*", [{d, debug}, {outdir, "ebin"}, {i, "include"}]}.
+{"src/plugins/*", [{d, debug}, {outdir, "ebin"}, {i, "include"}]}.
 {"deps/misultin/src/*", [{outdir, "ebin"}, {i, "deps/misultin/include"}]}.
 {"deps/erlydtl-0.5.3/src/erlydtl/*", [{outdir, "ebin"}, {i, "deps/erlydtl-0.5.3/include"}]}.
 % debug_info, bin_opt_info, 

src/amf0.erl

@@ -120,8 +120,14 @@ decode_list(List, Data) ->
 decode(Bin) ->	
   {string, Command, Rest} = parse(Bin),
   FullArguments = decode_list([], Rest),
-  [_Num | Arguments] = FullArguments,
-  #amf{command = list_to_atom(Command), args = Arguments, type = invoke}.
+  % ?D({"Rest", Rest, FullArguments}),
+  case FullArguments of
+    [{number, Id} | Arguments] -> #amf{command = list_to_atom(Command), args = Arguments, type = invoke, id = Id};
+    Arguments -> #amf{command = list_to_atom(Command), args = Arguments, type = notify}
+  end.
+  % [{number, Id} | Arguments] = FullArguments,
+  % #amf{command = list_to_atom(Command), args = Arguments, type = invoke, id = Id}.
+
   % case parse(Rest) of
   %   {{mixed_array, Rest2}, _Rest3} -> %without id,  set type to notify
   %     Args = decode_args(Rest2, []),

src/apps/apps_rtmp.erl

@@ -96,7 +96,7 @@ connect(AMF, #rtmp_client{window_size = WindowAckSize} = State) ->
 reply(Id, Args) ->
   gen_fsm:send_event(self(), {invoke, #amf{
                               command = '_result', 
-                              id = Id, %% muriel: dirty too, but the only way I can make this work
+                              id = Id,
                               type = invoke,
                               args= Args}}).
 

src/media/stream_media.erl

@@ -57,6 +57,7 @@ init([Name, record]) ->
   Clients = ets:new(clients, [set, private]),
 	FileName = filename:join([file_play:file_dir(), Name ++ ".flv"]),
 	(catch file:delete(FileName)),
+	ok = filelib:ensure_dir(FileName),
 	Header = flv:header(#flv_header{version = 1, audio = 1, video = 1}),
 	?D({"Recording to file", FileName}),
 	case file:open(FileName, [write, {delayed_write, 1024, 50}]) of
@@ -65,6 +66,7 @@ init([Name, record]) ->
 		  Recorder = #media_info{type=record, device = Device, file_name = FileName, ts_prev = 0, clients = Clients},
 			{ok, Recorder, ?TIMEOUT};
 		_Error ->
+		  error_logger:error_msg("Failed to start recording stream to ~p because of ~p", [FileName, _Error]),
 			ignore
   end.
 
@@ -120,7 +122,7 @@ handle_call({set_owner, _Owner}, _From, #media_info{owner = Owner} = MediaInfo)
 
 handle_call({publish, Channel}, _From, #media_info{device = Device, clients = Clients} = Recorder) ->
 	Tag = ems_flv:to_tag(Channel),
-  ?D({"Record",Channel#channel.type, Channel#channel.timestamp}),
+  % ?D({"Record",Channel#channel.type, Channel#channel.timestamp}),
 	case Device of
 	  undefined -> ok;
 	  _ -> file:write(Device, Tag)

src/plugins/.gitignore

@@ -0,0 +1,2 @@
+*.erl
+

src/rtmp.erl

@@ -272,7 +272,7 @@ command(#channel{type = Type}, State) ->
   State.
 
 call_function(unhandled, Command, #rtmp_client{addr = IP, port = Port} = State, #amf{args = Args}) ->
-  error_logger:error_msg("Client ~p:~p requested unknown function ~p/~p", [IP, Port, Command, length(Args)]),
+  error_logger:error_msg("Client ~p:~p requested unknown function ~p/~p~n", [IP, Port, Command, length(Args)]),
   State;
 
 call_function(App, Command, State, AMF) ->