This extends the special case of a fixed number of samples per frame that was supported before already.