stream: improve states

pinos/client/stream.c

@@ -135,18 +135,20 @@ clear_buffers (PinosStream *stream)
   spa_list_init (&impl->free);
 }
 
-static void
+static bool
 stream_set_state (PinosStream      *stream,
                   PinosStreamState  state,
                   char             *error)
 {
-  if (stream->state != state) {
+  bool res = stream->state != state;
+  if (res) {
     if (stream->error)
       free (stream->error);
     stream->error = error;
     stream->state = state;
     pinos_signal_emit (&stream->state_changed, stream);
   }
+  return res;
 }
 
 /**
@@ -604,19 +606,24 @@ handle_node_command (PinosStream      *stream,
   PinosContext *context = stream->context;
 
   if (SPA_COMMAND_TYPE (command) == context->type.command_node.Pause) {
+    add_async_complete (stream, seq, SPA_RESULT_OK);
+
+    if (stream->state == PINOS_STREAM_STATE_STREAMING) {
       pinos_log_debug ("stream %p: pause %d", stream, seq);
 
       pinos_loop_update_io (stream->context->loop,
                             impl->rtsocket_source,
                             SPA_IO_ERR | SPA_IO_HUP);
 
-    add_async_complete (stream, seq, SPA_RESULT_OK);
       stream_set_state (stream, PINOS_STREAM_STATE_PAUSED, NULL);
     }
+  }
   else if (SPA_COMMAND_TYPE (command) == context->type.command_node.Start) {
-    pinos_log_debug ("stream %p: start %d %d", stream, seq, impl->direction);
     add_async_complete (stream, seq, SPA_RESULT_OK);
 
+    if (stream->state == PINOS_STREAM_STATE_PAUSED) {
+      pinos_log_debug ("stream %p: start %d %d", stream, seq, impl->direction);
+
       pinos_loop_update_io (stream->context->loop,
                             impl->rtsocket_source,
                             SPA_IO_IN | SPA_IO_ERR | SPA_IO_HUP);
@@ -628,9 +635,9 @@ handle_node_command (PinosStream      *stream,
         pinos_signal_emit (&stream->need_buffer, stream);
         impl->in_need_buffer = false;
       }
-
       stream_set_state (stream, PINOS_STREAM_STATE_STREAMING, NULL);
     }
+  }
   else if (SPA_COMMAND_TYPE (command) == context->type.command_node.ClockUpdate) {
     SpaCommandNodeClockUpdate *cu = (SpaCommandNodeClockUpdate *) command;
     if (cu->body.flags.value & SPA_COMMAND_NODE_CLOCK_UPDATE_FLAG_LIVE) {
@@ -660,6 +667,8 @@ client_node_done (void              *object,
   pinos_log_info ("strean %p: create client node done with fd %d", stream, datafd);
   handle_socket (stream, datafd);
   do_node_init (stream);
+
+  stream_set_state (stream, PINOS_STREAM_STATE_CONFIGURE, NULL);
 }
 
 static void
@@ -703,11 +712,15 @@ client_node_set_format (void              *object,
 
   if (impl->format)
     free (impl->format);
-  impl->format = spa_format_copy (format);
+  impl->format = format ? spa_format_copy (format) : NULL;
   impl->pending_seq = seq;
 
   pinos_signal_emit (&stream->format_changed, stream, impl->format);
+
+  if (format)
     stream_set_state (stream, PINOS_STREAM_STATE_READY, NULL);
+  else
+    stream_set_state (stream, PINOS_STREAM_STATE_CONFIGURE, NULL);
 }
 
 static void
@@ -1038,7 +1051,7 @@ pinos_stream_finish_format (PinosStream     *stream,
   impl->port_info.n_params = n_params;
 
   if (SPA_RESULT_IS_OK (res)) {
-    add_port_update (stream, PINOS_MESSAGE_PORT_UPDATE_INFO |
+    add_port_update (stream, (n_params ? PINOS_MESSAGE_PORT_UPDATE_INFO : 0) |
                              PINOS_MESSAGE_PORT_UPDATE_FORMAT);
 
     if (!impl->format)

pinos/examples/video-src.c

@@ -69,6 +69,8 @@ typedef struct {
   PinosListener on_stream_state_changed;
   PinosListener on_stream_format_changed;
 
+  SpaVideoInfoRaw format;
+
   uint8_t params_buffer[1024];
   int counter;
 } Data;
@@ -170,6 +172,7 @@ on_stream_format_changed (PinosListener  *listener,
   SpaPODFrame f[2];
   SpaAllocParam *params[2];
 
+  if (format) {
     spa_pod_builder_init (&b, data->params_buffer, sizeof (data->params_buffer));
     spa_pod_builder_object (&b, &f[0], 0, ctx->type.alloc_param_buffers.Buffers,
         PROP      (&f[1], ctx->type.alloc_param_buffers.size,    SPA_POD_TYPE_INT, STRIDE * HEIGHT),
@@ -184,6 +187,10 @@ on_stream_format_changed (PinosListener  *listener,
 
     pinos_stream_finish_format (stream, SPA_RESULT_OK, params, 2);
   }
+  else {
+    pinos_stream_finish_format (stream, SPA_RESULT_OK, NULL, 0);
+  }
+}
 
 static void
 on_state_changed (PinosListener  *listener,

pinos/server/port.c

@@ -203,6 +203,9 @@ static SpaResult
 pinos_port_pause (PinosPort *port)
 {
   SpaCommand cmd = SPA_COMMAND_INIT (port->node->core->type.command_node.Pause);
+  if (port->state <= SPA_PORT_STATE_PAUSED)
+    return SPA_RESULT_OK;
+
   port->state = SPA_PORT_STATE_PAUSED;
   return spa_node_port_send_command (port->node->node,
                                     port->direction,